From b5de6041d59d2f0da0d3c3bf9cc3ab262c5f297a Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Mon, 21 Dec 2020 14:08:38 -0800
Subject: [PATCH] Remove ANDROID_EXPERIMENTAL_MTE.

Now that the feature guarded by this flag has landed in Linux 5.10
we no longer need the flag, so we can remove it.

Bug: 135772972
Change-Id: I02fa50848cbd0486c23c8a229bb8f1ab5dd5a56f
---
 core/jni/Android.bp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index b4572fda6ccaf..79a0dfd61e9fb 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -311,12 +311,6 @@ cc_library_shared {
         },
     },
 
-    product_variables: {
-        experimental_mte: {
-            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
-        },
-    },
-
     // Workaround Clang LTO crash.
     lto: {
         never: true,