Snap for 6663666 from b8e66a8dff92ab0019d0d506208a92de3a3e197d to rvc-qpr1-releaseandroid-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-release

Change-Id: I441186a0665b2ec3a538d2d09cf4597aaa8ada91

1 files changed, 6 insertions, 0 deletions

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