Merge "Make bionic_platform_headers available only for Bionic targets."
diff --git a/libc/Android.bp b/libc/Android.bp
index f73ae4a..b2ba2c3 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1751,6 +1751,7 @@
// 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__",
@@ -1762,7 +1763,6 @@
"//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 c751084..75fdd90 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -22,6 +22,12 @@
darwin: {
enabled: false,
},
+ android: {
+ header_libs: ["bionic_libc_platform_headers"],
+ },
+ linux_bionic: {
+ header_libs: ["bionic_libc_platform_headers"],
+ },
},
cflags: [
"-fstack-protector-all",
@@ -38,7 +44,6 @@
// 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 8928805..ff8cde6 100644
--- a/tests/mte_test.cpp
+++ b/tests/mte_test.cpp
@@ -14,6 +14,10 @@
* limitations under the License.
*/
+#include <sys/cdefs.h>
+
+#if defined(__BIONIC__)
+
#include <gtest/gtest.h>
#include <android-base/macros.h>
@@ -46,3 +50,5 @@
TEST(mte_test, ScopedDisableMTE) {
test_tag_mismatch();
}
+
+#endif // __BIONIC__
diff --git a/tests/utils.h b/tests/utils.h
index 5085a7a..a9b8513 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -25,7 +25,11 @@
#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>