summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-07-08 18:33:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-08 18:33:52 +0000
commitcdf88ab3830e5a530c0114047a19119d8304e58e (patch)
tree114480b59ffab1949f4e86e057fc54b35d047282
parenta51dd91cc2091c9e3734c802be560f0b72bc1427 (diff)
parent6453437eccb35caf51fc06c3b333994a1925bffd (diff)
downloadboringssl-cdf88ab3830e5a530c0114047a19119d8304e58e.tar.gz
Link libcrypto with -Bsymbolic. am: 6453437eccandroid-mainline-11.0.0_r35
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12108886 Change-Id: I4bf86b37dc4005a7f5d53a903b402c6a37dcb5f7
-rw-r--r--Android.bp6
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"],