Merge "Diable memtag_stack on fullmte builds." into main am: 2d57e36a39 am: 7520b915fe

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

Change-Id: Ib85d9463e3faf279a9d613203772dc73e63350d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mitch Phillips 2023-10-23 10:56:44 +00:00 committed by Automerger Merge Worker
commit c05e4f1484

View file

@ -20,7 +20,8 @@
# For more details, see: # For more details, see:
# https://source.android.com/docs/security/test/memory-safety/arm-mte # https://source.android.com/docs/security/test/memory-safety/arm-mte
ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),) ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),)
SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack) # TODO(b/292478827): Re-enable memtag_stack when new toolchain rolls.
SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap)
SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap) SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap)
endif endif
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync