diff options
author | Graciela Putri <gracielawputri@google.com> | 2023-04-04 15:07:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-04 15:07:40 +0000 |
commit | 6848c4475fbca6b69ba78c4bed00ec2a8c870e57 (patch) | |
tree | 6786671ad3818d2a50c716ad678fcb741b693889 | |
parent | 9f7f2c298ba588b413214a767c1f1c2f73c5d801 (diff) | |
parent | e19acaaca59d899ede0d4b680791a118f7a9d29c (diff) | |
download | boringssl-6848c4475fbca6b69ba78c4bed00ec2a8c870e57.tar.gz |
Merge "Revert "libcrypto_baremetal: Don't set OPENSSL_NO_ASM"" am: 22e88cfa06 am: 5f38f118e4 am: e19acaaca5
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2520678
Change-Id: Ie2967d69f8d29b3d1fe4a1558d4838e47e54ef7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -411,6 +411,7 @@ cc_library_static { cflags: [ "-DBORINGSSL_NO_STATIC_INITIALIZER", "-DOPENSSL_SMALL", + "-DOPENSSL_NO_ASM", "-D__TRUSTY__", ], visibility: [ |