commit 823cb099ed76de18ee992a85e909f5c75f847e49
author Evgenii Stepanov <eugenis@google.com> Wed Jun 07 15:14:22 2023 -0700
committer Evgenii Stepanov <eugenis@google.com> Thu Jun 15 15:31:07 2023 -0700
tree d8d09dfdc056f6086ba5f378b13d8b31893e94da
parent 3623295023945797abed415309fab0d97014486f

[NFC] Move MTE mode settings to a product variable.

The default list of memtag targets found in
  build/make/target/product/memtag-common.mk

Bug: 280343521
Test: no functional change
Merged-In: Ie2207f907e6559a3d54e329d09612a08afea2aa7
Change-Id: Ie2207f907e6559a3d54e329d09612a08afea2aa7
(cherry picked from commit f37c521c58cab7a5720ac38d15f297f0e3ed5928)

secure_element/1.0/Android.bp

diff --git a/secure_element/1.0/Android.bp b/secure_element/1.0/Android.bp
index c96ddd6..35d5c5c 100644
--- a/secure_element/1.0/Android.bp
+++ b/secure_element/1.0/Android.bp
@@ -39,10 +39,6 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }
 
 cc_binary {
@@ -76,8 +72,4 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }

secure_element/1.1/Android.bp

diff --git a/secure_element/1.1/Android.bp b/secure_element/1.1/Android.bp
index 7883976..adc9966 100644
--- a/secure_element/1.1/Android.bp
+++ b/secure_element/1.1/Android.bp
@@ -40,10 +40,6 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }
 
 cc_binary {
@@ -78,8 +74,4 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }

secure_element/1.2/Android.bp

diff --git a/secure_element/1.2/Android.bp b/secure_element/1.2/Android.bp
index b051652..a7caeff 100644
--- a/secure_element/1.2/Android.bp
+++ b/secure_element/1.2/Android.bp
@@ -41,10 +41,6 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }
 
 cc_binary {
@@ -80,8 +76,4 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }

secure_element/aidl/Android.bp

diff --git a/secure_element/aidl/Android.bp b/secure_element/aidl/Android.bp
index 9a1d3ce..e78a512 100644
--- a/secure_element/aidl/Android.bp
+++ b/secure_element/aidl/Android.bp
@@ -39,10 +39,6 @@
         "-Wno-error",
         "-Wreturn-type",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }
 
 cc_binary {
@@ -76,8 +72,4 @@
         "liblog",
         "libutils",
     ],
-
-    sanitize: {
-        memtag_heap: true,
-    },
 }