Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7520b915 authored by Mitch Phillips's avatar Mitch Phillips Committed by Automerger Merge Worker
Browse files

Merge "Diable memtag_stack on fullmte builds." into main am: 2d57e36a 

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



Change-Id: I6d539343ae6a96020efb7b1bbde3195a680bfab6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37bee01a 2d57e36a

target/product/fullmte.mk

+2 −1
Original line number Diff line number Diff line
@@ -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