commit 82a4cfb397190fa7f1182692891e4532b9fda22f
author Mitch Phillips <mitchp@google.com> Mon Mar 15 21:33:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 15 21:33:07 2021 +0000
tree 565aeef171568f916e79f8ecc1d42d14eaae01af
parent 4d71d704961694cff93131874c8786583bddfcf6
parent 1a8405f82714f02223c21c7e0d01ac5ee029104f

Merge "Add MTE ELF note to makefile-generated native tests."

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 40b2ba8..5745451 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -39,3 +39,9 @@
 LOCAL_MODULE_RELATIVE_PATH := $(LOCAL_MODULE)
 endif
 endif
+
+# Implicitly run this test under MTE SYNC for aarch64 binaries. This is a no-op
+# on non-MTE hardware.
+ifneq (,$(filter arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))
+  LOCAL_WHOLE_STATIC_LIBRARIES += note_memtag_heap_sync
+endif