commit 88a95a35fa33fda69117af5e7f41052b3216ba2c
author Evgenii Stepanov <eugenis@google.com> Tue Dec 04 17:06:45 2018 -0800
committer Evgenii Stepanov <eugenis@google.com> Wed Dec 05 01:15:01 2018 +0000
tree b124fc6c0e6c848dff6d44edd76c3496c261e078
parent 5df29604b94551d4a6498000260ac708d382e3d5

[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

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index fcf527e..42149ef 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -176,6 +176,7 @@
 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)),)