Merge "Revert "Make bionic_platform_headers available only for Bionic t...""

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,

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: {

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__

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>