commit 387c319ae2726622aa8904965f622db6d0975452
author Vishwath Mohan <vishwath@google.com> Thu Apr 20 21:39:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 21:39:47 2017 +0000
tree c9cb67f3c8f8979df3697f5df54464565106df04
parent 2a94e9dcc2794272829602a515a5ee66c92255f9
parent 385674cce9c03a17c884e7b43b5caead20fad120

Merge "Disable CFI for ASAN targets. (Make)" am: 594eb16b02 am: eac1397cc3
am: 385674cce9

Change-Id: I2b30d55d721b4b8c05bff5febf30cf1629536bba

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index d735a02..04aedf4 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -74,6 +74,12 @@
   my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
 endif
 
+# Also disable CFI if ASAN is enabled.
+ifneq ($(filter address,$(my_sanitize)),)
+  my_sanitize := $(filter-out cfi,$(my_sanitize))
+  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
+endif
+
 # CFI needs gold linker, and mips toolchain does not have one.
 ifneq ($(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
   my_sanitize := $(filter-out cfi,$(my_sanitize))