commit 22c90755ed1c5a90194d55f7e8ad4b4ac88f0800
author Mitch Phillips <mitchp@google.com> Wed Mar 03 15:39:57 2021 -0800
committer Mitch Phillips <mitchp@google.com> Wed Mar 03 15:39:57 2021 -0800
tree dedb4d5444a3a22d2db7380e372ead2bf707f097
parent 6161970fa29ea6792f4f2922c010e6adcb50243d

Mark MTE elf notes as sdk_version to allow SDK linkage.

Binaries defined in Makefiles that use the SDK need a variant to link
to. Generate a SDK variant of the ELF note as well. This is necessary to
allow makefile-generated binaries and CTS tests to use heap MTE.

Bug: 156029370
Bug: 181133973

Test: atest CtsBionicTestCases on QEMU+MTE, observe previously-failing
      tests will now succeed.
Change-Id: I0a8243b0920769a196e7596904259e30c4a93105

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 8d0a24b..a81600c 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2198,6 +2198,7 @@
         srcs: ["arch-arm64/bionic/note_memtag_heap_async.S"],
       }
     },
+    sdk_version: "minimum",
 
     defaults: ["crt_defaults"],
 }
@@ -2209,6 +2210,7 @@
         srcs: ["arch-arm64/bionic/note_memtag_heap_sync.S"],
       }
     },
+    sdk_version: "minimum",
 
     defaults: ["crt_defaults"],
 }