aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2023-06-15 01:39:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-15 01:39:48 +0000
commit2f59ba46eea88de071a9279ba68b5911d7fec804 (patch)
tree7012bde7386965c8e8452663fc2c56572c6eaf81
parent831d27c1c8333464195f71521ac87ecf3c86b886 (diff)
parente1cfd0a06a171bbdb7983627f4a07e34725515de (diff)
downloadiproute2-2f59ba46eea88de071a9279ba68b5911d7fec804.tar.gz
Merge "[NFC] Move MTE mode settings to a product variable." am: 130fbe91c7 am: 28fd4d5aa4 am: e1cfd0a06a
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2622659 Change-Id: Ie3327fd80b85347a5fea418826f038f6799dfe0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--ip/Android.bp4
-rw-r--r--misc/Android.bp4
-rw-r--r--tc/Android.bp4
3 files changed, 0 insertions, 12 deletions
diff --git a/ip/Android.bp b/ip/Android.bp
index b40fc4a0..329f7fa1 100644
--- a/ip/Android.bp
+++ b/ip/Android.bp
@@ -116,8 +116,4 @@ cc_binary {
"-Wl,-export-dynamic",
"-Wl,--no-gc-sections",
],
-
- sanitize: {
- memtag_heap: true,
- },
}
diff --git a/misc/Android.bp b/misc/Android.bp
index 5b75c71a..05376189 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -30,8 +30,4 @@ cc_binary {
],
ldflags: ["-Wl,-export-dynamic"],
-
- sanitize: {
- memtag_heap: true,
- },
}
diff --git a/tc/Android.bp b/tc/Android.bp
index 9ff95619..da087ff1 100644
--- a/tc/Android.bp
+++ b/tc/Android.bp
@@ -155,8 +155,4 @@ cc_binary {
// This is a work around for b/18403920
ldflags: ["-Wl,--no-gc-sections"],
-
- sanitize: {
- memtag_heap: true,
- },
}