From 88a95a35fa33fda69117af5e7f41052b3216ba2c Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Tue, 4 Dec 2018 17:06:45 -0800 Subject: [PATCH] [make] Disable CFI when building with HWASan. Same as soong. This needs do match, otherwise, for example, CFI may be disable in a static library in soong, and left enabled in a shared library in make; that would not work as CFI only supports DSO granularity. Bug: 120508119, 112709969 Change-Id: I00d6b1c9c373bcb6804c135407c6eeae88b375b6 Test: hwasan build of master branch boots --- core/config_sanitizers.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index fcf527e1af..42149ef08e 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -176,6 +176,7 @@ endif ifneq ($(filter hwaddress,$(my_sanitize)),) my_sanitize := $(filter-out address,$(my_sanitize)) my_sanitize := $(filter-out thread,$(my_sanitize)) + my_sanitize := $(filter-out cfi,$(my_sanitize)) endif ifneq ($(filter hwaddress,$(my_sanitize)),)