commit b9c39c3771ae478e4439cb261bfa8b40aa8813bc
author android-build-team Robot <android-build-team-robot@google.com> Thu Jun 03 01:04:30 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 03 01:04:30 2021 +0000
tree 898b0b36f5cf2cd98b160057f23d939750870492
parent 58da93e2147b800c4be64676ce7ae39fd38e6175
parent ca8d82796342c9c074bbf15fa386c7b92cb1beca

Snap for 7419753 from ca8d82796342c9c074bbf15fa386c7b92cb1beca to sc-release

Change-Id: Iab202983e8b25846066bfcb8d2526e974deb788f

ip/Android.bp

diff --git a/ip/Android.bp b/ip/Android.bp
index d15739e..25a4467 100644
--- a/ip/Android.bp
+++ b/ip/Android.bp
@@ -114,4 +114,8 @@
         "-Wl,-export-dynamic",
         "-Wl,--no-gc-sections",
     ],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }

misc/Android.bp

diff --git a/misc/Android.bp b/misc/Android.bp
index 0537618..5b75c71 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -30,4 +30,8 @@
     ],
 
     ldflags: ["-Wl,-export-dynamic"],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }

tc/Android.bp

diff --git a/tc/Android.bp b/tc/Android.bp
index 866a40e..3649ceb 100644
--- a/tc/Android.bp
+++ b/tc/Android.bp
@@ -119,4 +119,8 @@
 
     // This is a work around for b/18403920
     ldflags: ["-Wl,--no-gc-sections"],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }