From ed95d0134d323fcad28117edc31ff69921aee1fd Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Wed, 29 Apr 2020 12:14:09 +0000
Subject: [PATCH] Revert "Make bionic_platform_headers available only for
 Bionic t..."

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: I214f1165bb0a7e59d3b35a13b3cceb1965be922b
---
 libc/Android.bp    | 2 +-
 tests/Android.bp   | 7 +------
 tests/mte_test.cpp | 6 ------
 tests/utils.h      | 4 ----
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/libc/Android.bp b/libc/Android.bp
index b2ba2c332..f73ae4a58 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1751,7 +1751,6 @@ genrule {
 // Headers that only other parts of the platform can include.
 cc_library_headers {
     name: "bionic_libc_platform_headers",
-    defaults: ["linux_bionic_supported"],
     visibility: [
         "//art:__subpackages__",
         "//bionic:__subpackages__",
@@ -1763,6 +1762,7 @@ cc_library_headers {
         "//system/core/libunwindstack:__subpackages__",
         "//system/memory/libmemunreachable:__subpackages__",
     ],
+    host_supported: true,
     vendor_available: true,
     ramdisk_available: true,
     recovery_available: true,
diff --git a/tests/Android.bp b/tests/Android.bp
index 75fdd906f..c75108483 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -22,12 +22,6 @@ cc_defaults {
         darwin: {
             enabled: false,
         },
-        android: {
-            header_libs: ["bionic_libc_platform_headers"],
-        },
-        linux_bionic: {
-            header_libs: ["bionic_libc_platform_headers"],
-        },
     },
     cflags: [
         "-fstack-protector-all",
@@ -44,6 +38,7 @@ cc_defaults {
         // For glibc.
         "-D__STDC_LIMIT_MACROS",
     ],
+    header_libs: ["bionic_libc_platform_headers"],
     // Ensure that the tests exercise shadow call stack support and
     // the hint space PAC/BTI instructions.
     arch: {
diff --git a/tests/mte_test.cpp b/tests/mte_test.cpp
index ff8cde6ff..8928805e5 100644
--- a/tests/mte_test.cpp
+++ b/tests/mte_test.cpp
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#include <sys/cdefs.h>
-
-#if defined(__BIONIC__)
-
 #include <gtest/gtest.h>
 
 #include <android-base/macros.h>
@@ -50,5 +46,3 @@ static void test_tag_mismatch() {
 TEST(mte_test, ScopedDisableMTE) {
   test_tag_mismatch();
 }
-
-#endif  // __BIONIC__
diff --git a/tests/utils.h b/tests/utils.h
index a9b8513ef..5085a7a59 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -25,11 +25,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#if defined(__BIONIC__)
 #include <bionic/macros.h>
-#else
-#define untag_address(p) p
-#endif
 
 #include <atomic>
 #include <string>