Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap."

This commit is contained in:
Mitch Phillips
2021-04-13 15:31:14 +00:00
committed by Gerrit Code Review

View File

@@ -139,7 +139,7 @@ ifeq ($(filter memtag_heap, $(my_sanitize)),)
ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_sync_include_paths)),\
$(filter $(dir)%,$(LOCAL_PATH)))),)
my_sanitize := memtag_heap $(my_sanitize)
my_sanitize_diag := memtag_heap $(my_sanitize)
my_sanitize_diag := memtag_heap $(my_sanitize_diag)
else ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_async_include_paths)),\
$(filter $(dir)%,$(LOCAL_PATH)))),)
my_sanitize := memtag_heap $(my_sanitize)