commit fc596c996f35e123a0c2430894500aae97b5fde7
author Daniel Norman <danielnorman@google.com> Fri Jan 15 16:31:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 15 16:31:58 2021 +0000
tree 423a0232e5b2b7a6ef9b5a69d6a6e2ca26a53948
parent 7604390e4c41a1438cda0f93153effa796b65ac0
parent c3d7fff34890002c35b7d3e37107ce8e5f09b30c

Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index eaab1b5..c92cea2 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -441,3 +441,13 @@
     endif
   endif
 endif
+
+# http://b/177566116, libc++ may crash with this sanitizer.
+# Disable this check unless it has been explicitly specified.
+ifneq ($(findstring fsanitize,$(my_cflags)),)
+  ifneq ($(findstring integer,$(my_cflags)),)
+    ifeq ($(findstring sanitize=unsigned-shift-base,$(my_cflags)),)
+      my_cflags += -fno-sanitize=unsigned-shift-base
+    endif
+  endif
+endif