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

am: eddf74cadb

Change-Id: I1f954ebfd9b948a554f994840bce7e33563219b3
This commit is contained in:
Vishwath Mohan 2017-04-20 01:44:59 +00:00 committed by android-build-merger
commit 69a345338a
1 changed files with 1 additions and 1 deletions

View File

@ -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