Snap for 7422643 from 294c0f6b68a9e6272d3a170a32cc279581685c10 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-s-v2-preview-2android-s-v2-beta-2android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r28android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsi

Change-Id: I406bb3639cfdbbdc1263fecfae87d128d1e92403

3 files changed, 12 insertions, 0 deletions

diff --git a/ip/Android.bp b/ip/Android.bp
index d15739eb..25a44677 100644
--- a/ip/Android.bp
+++ b/ip/Android.bp
@@ -114,4 +114,8 @@ cc_binary {
         "-Wl,-export-dynamic",
         "-Wl,--no-gc-sections",
     ],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }
diff --git a/misc/Android.bp b/misc/Android.bp
index 05376189..5b75c71a 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -30,4 +30,8 @@ cc_binary {
     ],
 
     ldflags: ["-Wl,-export-dynamic"],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }
diff --git a/tc/Android.bp b/tc/Android.bp
index 866a40e2..3649cebb 100644
--- a/tc/Android.bp
+++ b/tc/Android.bp
@@ -119,4 +119,8 @@ cc_binary {
 
     // This is a work around for b/18403920
     ldflags: ["-Wl,--no-gc-sections"],
+
+    sanitize: {
+        memtag_heap: true,
+    },
 }