Revert "bionic_libc_platform_headers is only available when buil..."

Reason for revert: Breaks rvc-d1-dev-plus-aosp: http://ab/6443190
Reverted Changes:
Ide447b89a:bionic_libc_platform_headers is only available whe...
Ia93cd3ec8:bionic_libc_platform_headers is only available whe...
Icdc495588:Make bionic_platform_headers available only for Bi...
Idfd7c87dc:bionic_libc_platform_headers is only available whe...

Bug: 152255951
Bug: 155269399
Change-Id: Iafb6584aba116b90cc1a2a5dd34587288943a0a7

2 files changed, 8 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index 9ce5fc7..df49a01 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,25 +13,19 @@ cc_defaults {
     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 {
diff --git a/HeapWalker.cpp b/HeapWalker.cpp
index c602c7f..dab1029 100644
--- a/HeapWalker.cpp
+++ b/HeapWalker.cpp
@@ -20,9 +20,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#if defined(__BIONIC__)
 #include <bionic/mte.h>
-#endif
 
 #include <map>
 #include <utility>
@@ -77,9 +75,7 @@ bool HeapWalker::Allocation(uintptr_t begin, uintptr_t end) {
 // 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);
 }