[coastguard skipped] Merge sparse cherrypicks from sparse-12545800-L17400030007600540 into 24Q4-release.
COASTGUARD_SKIP: Ibce65e1ae474283385e59ddeee9d9bbc6d2f3f4c
Change-Id: I99d5df7b9249ed1eeb5bd0d31519747d7828d0ad
diff --git a/core/build_id.mk b/core/build_id.mk
index cf7016b..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.F1
+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