diff --git a/target/product/fullmte.mk b/target/product/fullmte.mk index d47c685584..5726c06de3 100644 --- a/target/product/fullmte.mk +++ b/target/product/fullmte.mk @@ -20,7 +20,8 @@ # For more details, see: # https://source.android.com/docs/security/test/memory-safety/arm-mte 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) endif PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync