commit 33b15bd3745acaebb2a1880a5efff417a43de34b
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 15 15:12:39 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Jun 15 15:12:39 2020 -0700
tree 89f9d492f6d26f086d0a795072961e5f1cb052e6
parent 9667c8f498d199507e6410dcca4e8664ad22d2ae
parent 4c706bb0c09920ff7c9bcc1618c7e777f7d59773

Merge 4c706bb0c09920ff7c9bcc1618c7e777f7d59773 on remote branch

Change-Id: I41b2e005becd385726fc6c00a3cdcb40388f6763

Android.bp

diff --git a/Android.bp b/Android.bp
index 958e669..c831677 100644
--- a/Android.bp
+++ b/Android.bp
@@ -183,6 +183,12 @@
             cflags: [
                 "-DBORINGSSL_FIPS",
             ],
+            sanitize: {
+                // Disable address sanitizing otherwise libcrypto will not report
+                // itself as being in FIPS mode, which causes boringssl_self_test
+                // to fail.
+                address: false,
+            },
             inject_bssl_hash: true,
             static: {
                 // Disable the static version of libcrypto, as it causes