commit 69a345338ac7389527eff66f32a62772edf4c21d
author Vishwath Mohan <vishwath@google.com> Thu Apr 20 01:44:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 01:44:59 2017 +0000
tree e8f277fce68149a60286ec91c5b7a2b958ee341f
parent 6e790c6a49d8a505c79f26debdfeddd41e886155
parent eddf74cadb7111d4d391f08bab96698b667ccbb7

Merge "Change the global CFI flag to default to enabled."
am: eddf74cadb

Change-Id: I1f954ebfd9b948a554f994840bce7e33563219b3

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 729ef48..d735a02 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -63,7 +63,7 @@
 endif
 
 # If CFI is disabled globally, remove it from my_sanitize.
-ifeq ($(strip $(ENABLE_CFI)),)
+ifeq ($(strip $(ENABLE_CFI)),false)
   my_sanitize := $(filter-out cfi,$(my_sanitize))
   my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
 endif