diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-04-04 12:40:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-04 12:40:47 +0000 |
commit | 9f7f2c298ba588b413214a767c1f1c2f73c5d801 (patch) | |
tree | 8d3cc415dd13cfac15196e851d2682f41ef1c3af | |
parent | 7e50aa573d2f88f0da6dd92be1c87bd7f7be5eda (diff) | |
parent | 270b6039cc85bc18e77d367a9950c233fe5ff312 (diff) | |
download | boringssl-9f7f2c298ba588b413214a767c1f1c2f73c5d801.tar.gz |
Merge changes I9951c7a6,Icce0ff2e am: 48e576333d am: ba78c80b78 am: 270b6039cc
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2520677
Change-Id: I3ae6643762fa87ed9121c47f81da03df31cc1993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -409,8 +409,8 @@ cc_library_static { "boringssl_flags", ], cflags: [ + "-DBORINGSSL_NO_STATIC_INITIALIZER", "-DOPENSSL_SMALL", - "-DOPENSSL_NO_ASM", "-D__TRUSTY__", ], visibility: [ |