commit 1a8405f82714f02223c21c7e0d01ac5ee029104f
author Mitch Phillips <mitchp@google.com> Mon Mar 01 09:12:25 2021 -0800
committer Mitch Phillips <mitchp@google.com> Mon Mar 15 10:45:05 2021 -0700
tree d4c086c95ed9aa705e64631a2a39a8c8839fcde6
parent 345294f459ec83599053b308085d45bce0c1e788

Add MTE ELF note to makefile-generated native tests.

The MTE ELF note is intended to be added to all aarch64 test binaries.
This is already implemented for cc_test in soong, but we should also add
it to makefile-generated tests.

Bug: 156029370
Bug: 181133973

Test: atest CtsBionicTestCases on QEMU+MTE, observe previously-failing
      tests will now succeed.
Test: m camera_client_test; readelf -t <snip>/camera_client_test | grep
      memtag, make sure there's the elf note.

Change-Id: I2e7c4d1379ccdef04f05dd7aff675e6834d4799b

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