commit 2de49ac2b7ce36fc82debb2250e7219469ba01cf
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 21:30:11 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 21:30:11 2020 +0000
tree 9120e26fa16fb4a61dbccb40fada07c747ea7c84
parent e0f428e096a6c4062de607585bd3f8d2b8380e02
parent 9baac65f458f8a9529785232bfad0d252b3c80a7

Merge "Prepare for memory tagging support." am: b8d62ff028 am: 9baac65f45

Change-Id: Id91d9bf531e2ef4f565612bf146789c50f215423

Android.bp

diff --git a/Android.bp b/Android.bp
index 9583768..5703ec1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -91,6 +91,11 @@
     header_libs: [
         "bionic_libc_platform_headers",
     ],
+    product_variables: {
+        experimental_mte: {
+            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
+        },
+    },
 }
 
 cc_library_static {
@@ -138,5 +143,13 @@
         "-Wno-unused-parameter",
         "-fno-emulated-tls",
     ],
+    header_libs: [
+        "bionic_libc_platform_headers",
+    ],
+    product_variables: {
+        experimental_mte: {
+            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
+        },
+    },
     test_suites: ["general-tests"],
 }