commit eb95416d0ba76da6979804f32fdcd9ee57c5bdd2
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 09 01:13:15 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 09 01:13:15 2020 +0000
tree 114480b59ffab1949f4e86e057fc54b35d047282
parent 35c5693bf14f70351ddd36b3b172b06169af6e59
parent e864986f14977cbf54eb244b26b22be106a40a9e

Snap for 6664195 from e864986f14977cbf54eb244b26b22be106a40a9e to rvc-d1-release

Change-Id: Ib2bcd6f4d383a872bf87a0b680598f454817ff28

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