From 445c2853b9a46fca3ecea9702103820343b42b32 Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 24 Jan 2017 14:06:42 -0800 Subject: [PATCH] Change the global CFI flag to default to enabled. This CL changes the ENABLE_CFI flag to default to enabled. Setting it to false will override local settings to enable CFI. Bug: 30227045 Bug: 22033465 Test: m -j40 works and device boots Test: cfi is honored unless the global flag is set. Change-Id: I1e449f5a4c56a76865ebe5bb8613e3781fbbac14 --- core/soong_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index 7b1be47be..ff0fd9dc3 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -63,7 +63,7 @@ $(SOONG_VARIABLES): FORCE 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 true,$(PRODUCT_ART_USE_READ_BARRIER)),true,false),'; \ echo ''; \