OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update master-with-bazel from master branch

Browse Source
This commit is contained in:
BoringSSL Robot
2023-08-05 12:38:57 +00:00
parent ff486433e9 e28988ecaa
commit 4e29068fa8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/generate_build_files.py
+6 -6
View File
@@ -152,14 +152,14 @@ class Android(object):
if asm_files:
blueprint.write(' target: {\n')
# Only emit asm for non-Windows. On Windows, BoringSSL requires NASM,
# which is not available in AOSP. Note that, despite the name,
# "not_windows" covers only non-Windows host devices.
blueprint.write(' android: {\n')
# Only emit asm for Linux. On Windows, BoringSSL requires NASM, which is
# not available in AOSP. On Darwin, the assembly works fine, but it
# conflicts with Android's FIPS build. See b/294399371.
blueprint.write(' linux: {\n')
blueprint.write(' srcs: %s_asm,\n' % name)
blueprint.write(' },\n')
blueprint.write(' not_windows: {\n')
blueprint.write(' srcs: %s_asm,\n' % name)
blueprint.write(' darwin: {\n')
blueprint.write(' cflags: ["-DOPENSSL_NO_ASM"],\n')
blueprint.write(' },\n')
blueprint.write(' windows: {\n')
blueprint.write(' cflags: ["-DOPENSSL_NO_ASM"],\n')