summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraciela Putri <gracielawputri@google.com>2023-04-04 14:08:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-04 14:08:48 +0000
commit5f38f118e4386176c120199cfe7f57268344032d (patch)
tree3485dc82283f91194710da8d4441b1db7ca4df24
parentba78c80b78dd3b1379ea2c6ffa62df3c81589092 (diff)
parent22e88cfa06e671a85ac14b4b3591dc6c04dae8d5 (diff)
downloadboringssl-5f38f118e4386176c120199cfe7f57268344032d.tar.gz
Merge "Revert "libcrypto_baremetal: Don't set OPENSSL_NO_ASM"" am: 22e88cfa06
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2520678 Change-Id: I452c3438ec789afe9f5b53c1c313368f1734fee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 7adbb504..c38096ce 100644
--- a/Android.bp
+++ b/Android.bp
@@ -407,6 +407,7 @@ cc_library_static {
cflags: [
"-DBORINGSSL_NO_STATIC_INITIALIZER",
"-DOPENSSL_SMALL",
+ "-DOPENSSL_NO_ASM",
"-D__TRUSTY__",
],
visibility: [