commit 6453437eccb35caf51fc06c3b333994a1925bffd
author Pete Bentley <prb@google.com> Tue Jun 30 16:45:33 2020 +0100
committer Pete Bentley <prb@google.com> Wed Jul 08 18:04:54 2020 +0100
tree 114480b59ffab1949f4e86e057fc54b35d047282
parent 2267f65417a0b43437ad56f6321e87308cb5e421

Link libcrypto with -Bsymbolic.

Prevents crypto-related symbols from being resolved from
libraries earlier in the search path and e.g. breaking the
FIPS integrity checks.

Bug: 160231064
Test: m && flashall
Change-Id: I9c9f7139f518770b4553e89d91f9a69aa700478e
(cherry picked from commit 1e9e5857536942a4cc097a38d4331e27c4172d00)

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"],