Merge "[memtag] Disable memtag for AndroidMk host modules." am: 38d4a2a19e

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

Change-Id: Id76d763164debaf01461f8d6eaaa4d7bae5e247b
This commit is contained in:
Treehugger Robot
2021-05-25 04:30:02 +00:00
committed by Automerger Merge Worker

View File

@@ -167,6 +167,13 @@ ifneq ($(filter address,$(my_sanitize)),)
my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
endif
# Disable memtag for host targets. Host executables in AndroidMk files are
# deprecated, but some partners still have them floating around.
ifdef LOCAL_IS_HOST_MODULE
my_sanitize := $(filter-out memtag_heap,$(my_sanitize))
my_sanitize_diag := $(filter-out memtag_heap,$(my_sanitize_diag))
endif
# Disable sanitizers which need the UBSan runtime for host targets.
ifdef LOCAL_IS_HOST_MODULE
my_sanitize := $(filter-out cfi,$(my_sanitize))