summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorMitch Phillips <mitchp@google.com>2023-06-15 11:13:26 +0200
committerMitch Phillips <mitchp@google.com>2023-06-15 12:56:35 +0200
commit028e3abd7cf1040817ac32eed3954d1b4c715caa (patch)
treee9fb1ace70b22a311f01e08de3124319c80fa58a /third_party
parenteaf5bfd211d8e418bcbc7316593c3da0e5695987 (diff)
downloadcronet-028e3abd7cf1040817ac32eed3954d1b4c715caa.tar.gz
Diasble memtag_globals for boringssl (inside cronet).
HWASan is explicitly given (-fsanitize=hwaddress) to bcm_object to ensure a correct global reference. This is incompatible with memtag_globals, at build time. Just disable memtag_globals here for now. Test: Build android with SANITIZE_TARGET=memtag_globals Bug: N/A Change-Id: I52aae0f7e64bab9d5175e333711873e8343fba0f
Diffstat (limited to 'third_party')
-rw-r--r--third_party/boringssl/Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/boringssl/Android.bp b/third_party/boringssl/Android.bp
index b79adb1e0..499d978b3 100644
--- a/third_party/boringssl/Android.bp
+++ b/third_party/boringssl/Android.bp
@@ -116,6 +116,7 @@ cc_object {
// to help prevent
// merge conflicts.
fuzzer: false,
+ memtag_globals: false,
},
target: {
android: {
@@ -161,6 +162,7 @@ cc_object {
address: false,
hwaddress: false,
fuzzer: false,
+ memtag_globals: false,
},
target: {
android: {