Merge "[make] Disable CFI when building with HWASan." am: 696dd3bd93 am: fbf0759fa3

am: cb4bad2ca0

Change-Id: Ie3e0896ae5036b6b0c721572c31fbc10ea3d7bce
This commit is contained in:
Evgenii Stepanov 2018-12-05 14:42:40 -08:00 committed by android-build-merger
commit 8607d84d7c

View file

@ -176,6 +176,7 @@ endif
ifneq ($(filter hwaddress,$(my_sanitize)),) ifneq ($(filter hwaddress,$(my_sanitize)),)
my_sanitize := $(filter-out address,$(my_sanitize)) my_sanitize := $(filter-out address,$(my_sanitize))
my_sanitize := $(filter-out thread,$(my_sanitize)) my_sanitize := $(filter-out thread,$(my_sanitize))
my_sanitize := $(filter-out cfi,$(my_sanitize))
endif endif
ifneq ($(filter hwaddress,$(my_sanitize)),) ifneq ($(filter hwaddress,$(my_sanitize)),)