commit 9d76dfd759acd796cbe25312088bdcad6fa563fb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Nov 18 22:45:09 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Nov 18 22:45:09 2024 +0000
tree b8a1756d20397a10566f13374998ec6311375ba0
parent 0edb71f4a4da788d3e00aa4bb421a7ef56b3bde1
parent d31a642ab3924db56dbc2c5ed4baedb87b518a9e

[coastguard skipped] Merge sparse cherrypicks from sparse-12636973-L99400030007843745 into 24Q4-release.

COASTGUARD_SKIP: Idd8638b9e270c533eacce7da8c297654aa84bfb4

Change-Id: Ibcfbc679cbc20076b1959016fdc713f0d7ef6c10

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 30dd53f..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.F2
+BUILD_ID=AP4A.241205.013

core/config_sanitizers.mk

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