commit 77c045d2cca3e49df7239fd945e4f09450e3adad
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed May 27 20:46:41 2020 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Wed May 27 20:46:41 2020 +0000
tree 4cd058e4d70139cc8415ec9e10c265e10f847217
parent ec79b4b7232609a536a4c74ffa274e24dfc547d3
parent 85ad401b7738905aeb2a4ebbe35045f9703ef4dd

Snap for 6533464 from 85ad401b7738905aeb2a4ebbe35045f9703ef4dd to sdk-release

Change-Id: I6d9be7408a98b8790c61e86606e067aa346b0e2a

Android.bp

diff --git a/Android.bp b/Android.bp
index df49a01..9ce5fc7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,19 +13,25 @@
     target: {
         android: {
             static_libs: ["libasync_safe"],
+            header_libs: ["bionic_libc_platform_headers"],
+            product_variables: {
+                experimental_mte: {
+                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
+                },
+            },
+        },
+        linux_bionic: {
+            header_libs: ["bionic_libc_platform_headers"],
+            product_variables: {
+                experimental_mte: {
+                    cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
+                },
+            },
         },
         host: {
             shared_libs: ["liblog"],
         },
     },
-
-    header_libs: ["bionic_libc_platform_headers"],
-
-    product_variables: {
-        experimental_mte: {
-            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
-        },
-    },
 }
 
 cc_library {

HeapWalker.cpp

diff --git a/HeapWalker.cpp b/HeapWalker.cpp
index dab1029..c602c7f 100644
--- a/HeapWalker.cpp
+++ b/HeapWalker.cpp
@@ -20,7 +20,9 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
+#if defined(__BIONIC__)
 #include <bionic/mte.h>
+#endif
 
 #include <map>
 #include <utility>
@@ -75,7 +77,9 @@
 // With MTE we set PSTATE.TCO during the access to suppress tag checks.
 static uintptr_t ReadWordAtAddressUnsafe(uintptr_t word_ptr)
     __attribute__((no_sanitize("address", "hwaddress"))) {
+#if defined(__BIONIC__)
   ScopedDisableMTE x;
+#endif
   return *reinterpret_cast<uintptr_t*>(word_ptr);
 }