commit e864986f14977cbf54eb244b26b22be106a40a9e
author Pete Bentley <prb@google.com> Wed Jul 08 18:33:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 18:33:31 2020 +0000
tree 114480b59ffab1949f4e86e057fc54b35d047282
parent 5fb8f8641f36bec43066370f2743e9513dd9d2d5
parent 6453437eccb35caf51fc06c3b333994a1925bffd

Link libcrypto with -Bsymbolic. am: 6453437ecc

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

Change-Id: I5b94dad6c729b4888c1849ad2b83c01f9efd16fd

Android.bp

diff --git a/Android.bp b/Android.bp
index c831677..6ff1bf8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,6 +67,12 @@
         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"],