summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-06-30 16:45:33 +0100
committerPete Bentley <prb@google.com>2020-07-08 18:04:54 +0100
commit6453437eccb35caf51fc06c3b333994a1925bffd (patch)
tree114480b59ffab1949f4e86e057fc54b35d047282
parent2267f65417a0b43437ad56f6321e87308cb5e421 (diff)
downloadboringssl-6453437eccb35caf51fc06c3b333994a1925bffd.tar.gz
Link libcrypto with -Bsymbolic.android11-dev
Prevents crypto-related symbols from being resolved from libraries earlier in the search path and e.g. breaking the FIPS integrity checks. Bug: 160231064 Test: m && flashall Change-Id: I9c9f7139f518770b4553e89d91f9a69aa700478e (cherry picked from commit 1e9e5857536942a4cc097a38d4331e27c4172d00)
-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"],