From 45665b40e89b22f41d67791a260ea93854b1a07c Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Tue, 24 Jan 2017 13:20:28 -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: I16ea3ecb704d4ce70bd91be8a4e5ae6e4f63ea0f --- core/config_sanitizers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 38cf86da6..4a35299dd 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -63,7 +63,7 @@ ifeq ($(LOCAL_SANITIZE),never) 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