diff options
author | Graciela Putri <gracielawputri@google.com> | 2023-04-04 14:37:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-04 14:37:10 +0000 |
commit | e19acaaca59d899ede0d4b680791a118f7a9d29c (patch) | |
tree | 3485dc82283f91194710da8d4441b1db7ca4df24 | |
parent | 270b6039cc85bc18e77d367a9950c233fe5ff312 (diff) | |
parent | 5f38f118e4386176c120199cfe7f57268344032d (diff) | |
download | boringssl-e19acaaca59d899ede0d4b680791a118f7a9d29c.tar.gz |
Merge "Revert "libcrypto_baremetal: Don't set OPENSSL_NO_ASM"" am: 22e88cfa06 am: 5f38f118e4
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2520678
Change-Id: Ia3db57cd5b3be754a9491c8c7034bc9bc7634628
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
@@ -407,6 +407,7 @@ cc_library_static { cflags: [ "-DBORINGSSL_NO_STATIC_INITIALIZER", "-DOPENSSL_SMALL", + "-DOPENSSL_NO_ASM", "-D__TRUSTY__", ], visibility: [ |