commit b94ec526dc9909546fe74d0c2ce01cb3e0db2691
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 08 23:02:21 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 08 23:02:21 2020 +0000
tree 114480b59ffab1949f4e86e057fc54b35d047282
parent d888dac7a372ff2b441b4b29895cc904bb10fbb7
parent b8e66a8dff92ab0019d0d506208a92de3a3e197d

Snap for 6663666 from b8e66a8dff92ab0019d0d506208a92de3a3e197d to rvc-qpr1-release

Change-Id: I441186a0665b2ec3a538d2d09cf4597aaa8ada91

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