Link libcrypto with -Bsymbolic. am: 6453437ecc am: e864986f14android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr2-releaseandroid11-qpr1-c-release

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12108886

Change-Id: I29bd6e8d896b4277002b139f843e2ad86dd080f8

1 files changed, 6 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index c8316775..6ff1bf8c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,6 +67,12 @@ cc_defaults {
         host: {
             host_ldlibs: ["-lpthread"],
         },
+        android: {
+            // On FIPS builds (i.e. Android only) prevent other libraries
+            // from pre-empting symbols in libcrypto which could affect FIPS
+            // compliance and cause integrity checks to fail. See b/160231064.
+            ldflags: ["-Wl,-Bsymbolic"],
+        },
     },
 
     local_include_dirs: ["src/crypto"],