[NFC] Move MTE mode settings to a product variable. am: 823cb099ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/secure_element2/+/23709658
Change-Id: I7663f4f56a31a82bfb9685ef601a8c9d06f6276e
Signed-off-by: Automerger Merge Worker <[email protected]>
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,
- },
}
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,
- },
}
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,
- },
}
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,
- },
}
