commit 38d4a2a19e8455b3ee74dccc43c103d8e3f0bec5
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 25 04:05:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 25 04:05:59 2021 +0000
tree 539a6f1f1b75fc4f91b9f935dc34b62d3f04eae1
parent e9423b0b09a80e6f626ac50fc444f8afac8f984c
parent b71a875bba1de2815d21a6761ffeacc12f01027b

Merge "[memtag] Disable memtag for AndroidMk host modules."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 90f00c0..46f7f24 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -167,6 +167,13 @@
   my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
 endif
 
+# Disable memtag for host targets. Host executables in AndroidMk files are
+# deprecated, but some partners still have them floating around.
+ifdef LOCAL_IS_HOST_MODULE
+  my_sanitize := $(filter-out memtag_heap,$(my_sanitize))
+  my_sanitize_diag := $(filter-out memtag_heap,$(my_sanitize_diag))
+endif
+
 # Disable sanitizers which need the UBSan runtime for host targets.
 ifdef LOCAL_IS_HOST_MODULE
   my_sanitize := $(filter-out cfi,$(my_sanitize))