Merge "Change the global CFI flag to default to enabled." am: eddf74cadb
am: 69a345338a
Change-Id: Ic67b7e76b5a4ee8b3342ef020d0c5cd16318a70e
This commit is contained in:
commit
bb68c9e60a
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue