commit 45fd769588ecde41705c14f92b8797f4cffe625b
author Vishwath Mohan <vishwath@google.com> Thu Apr 20 01:39:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 20 01:39:56 2017 +0000
tree bd4ebaa6338f96fee4182aa70e631a46bcabee94
parent c8387929d1e31b8794e63e9305434065a3de7153
parent 445c2853b9a46fca3ecea9702103820343b42b32

Merge "Change the global CFI flag to default to enabled."

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 6416dc6..cba9d84 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -77,7 +77,7 @@
 	echo '    "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \
 	echo '    "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_ARCH)",'; \
 	echo '    "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false),'; \
-	echo '    "EnableCFI": $(if $(filter true,$(ENABLE_CFI)),true,false),'; \
+	echo '    "EnableCFI": $(if $(filter false,$(ENABLE_CFI)),false,true),'; \
 	echo ''; \
 	echo '    "ArtUseReadBarrier": $(if $(filter false,$(PRODUCT_ART_USE_READ_BARRIER)),false,true),'; \
 	echo ''; \