Merge "Don't enable CFI diagnostics in include paths." am: 689e71c3b6

am: eb8b6624c9 Change-Id: I77e1b438bee52089061d0f2c8fd8af1cc9aae850
2019-02-06 17:41:52 -08:00 · 2019-02-06 17:41:52 -08:00 · 90131145f0
parent 01841d77a8 eb8b6624c9
commit 90131145f0
1 changed files with 0 additions and 1 deletions
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@ -112,7 +112,6 @@ ifeq ($(filter cfi, $(my_sanitize)),)
    ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
           $(filter $(dir)%,$(LOCAL_PATH)))),)
      my_sanitize := cfi $(my_sanitize)
-      my_sanitize_diag := cfi $(my_sanitize_diag)
    endif
  endif
 endif