commit 35c5693bf14f70351ddd36b3b172b06169af6e59
author android-build-team Robot <android-build-team-robot@google.com> Wed May 13 02:12:33 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 13 02:12:33 2020 +0000
tree 89f9d492f6d26f086d0a795072961e5f1cb052e6
parent 4ceca759a6d03cb8cf27b343707f7c62c1657f02
parent 5fb8f8641f36bec43066370f2743e9513dd9d2d5

Snap for 6488474 from 5fb8f8641f36bec43066370f2743e9513dd9d2d5 to rvc-d1-release

Change-Id: I5f54fd38f41e433c54efca98e62d1a177df1f706

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