[coastguard skipped] Merge sparse cherrypicks from sparse-12553254-L49400030007650015 into 24Q4-release.
COASTGUARD_SKIP: I155fc8daf99581bfa29683ee5532b2be0fa92c2e
Change-Id: I5021de8533d78c0c01d7a9b7f475c88750059e16
diff --git a/core/build_id.mk b/core/build_id.mk
index aa7a687..fcc0f39 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=AP4A.241205.004.E2
+BUILD_ID=AP4A.241205.013
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index c0f2c68..ab2d5c1 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -284,9 +284,9 @@
ifneq ($(filter memtag_stack,$(my_sanitize)),)
my_cflags += -fsanitize=memtag-stack
my_ldflags += -fsanitize=memtag-stack
- my_cflags += -Xclang -target-feature -Xclang +mte
- my_ldflags += -Xclang -target-feature -Xclang +mte
- my_asflags += -Xclang -target-feature -Xclang +mte
+ my_cflags += -march=armv8a+memtag
+ my_ldflags += -march=armv8a+memtag
+ my_asflags += -march=armv8a+memtag
my_sanitize := $(filter-out memtag_stack,$(my_sanitize))
endif