Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 am: c007630a9a

Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

Change-Id: I63bc93527591b28b13189c5880f6c9097e21b4ce
This commit is contained in:
Mitch Phillips
2021-04-13 16:27:14 +00:00
committed by Automerger Merge Worker

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)