commit 0b4ad5e5d41c6ad91df11cdd414d2040644380b8
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 09 01:07:06 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 09 01:07:06 2020 +0000
tree 114480b59ffab1949f4e86e057fc54b35d047282
parent 726ff1665ad976aa289c359fa40e5e8cfc2d2449
parent 6453437eccb35caf51fc06c3b333994a1925bffd

Snap for 6664334 from 6453437eccb35caf51fc06c3b333994a1925bffd to rvc-release

Change-Id: I22d9c432a0791d7e5db6f082f23685dbf9bdfc3d

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