Move the bionic_libc_platform_headers dependency to where it is used.
To avoid dependencies in the common default.
Test: art/build/apex/runtests.sh
Test: m art-module-sdk art-module-{host,test}-exports
Bug: 204364566
Change-Id: If9c5732c55b22928c98042c3da28690cae01803f
diff --git a/build/Android.bp b/build/Android.bp
index ad27d42..e54e2d3 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -173,11 +173,6 @@
// "-marm",
// "-mapcs",
],
- header_libs: [
- // We optimize Thread::Current() with a direct TLS access. This requires access to a
- // platform specific Bionic header.
- "bionic_libc_platform_headers",
- ],
},
linux: {
cflags: [
@@ -187,11 +182,6 @@
],
},
linux_bionic: {
- header_libs: [
- // We optimize Thread::Current() with a direct TLS access. This requires access to a
- // platform specific Bionic header.
- "bionic_libc_platform_headers",
- ],
strip: {
// Do not strip art libs when building for linux-bionic.
// Otherwise we can't get any symbols out of crashes.
diff --git a/runtime/Android.bp b/runtime/Android.bp
index be060c9..7d793a6 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -78,6 +78,19 @@
header_libs: ["art_libartbase_headers"],
export_header_lib_headers: ["art_libartbase_headers"],
+ // We optimize Thread::Current() with a direct TLS access. This requires
+ // access to a platform specific Bionic header.
+ target: {
+ android: {
+ header_libs: ["bionic_libc_platform_headers"],
+ export_header_lib_headers: ["bionic_libc_platform_headers"],
+ },
+ linux_bionic: {
+ header_libs: ["bionic_libc_platform_headers"],
+ export_header_lib_headers: ["bionic_libc_platform_headers"],
+ },
+ },
+
apex_available: [
"com.android.art",
"com.android.art.debug",
diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp
index f8c8379..ee874dc 100644
--- a/sigchainlib/Android.bp
+++ b/sigchainlib/Android.bp
@@ -49,8 +49,13 @@
},
android: {
+ header_libs: ["bionic_libc_platform_headers"],
static_libs: ["libasync_safe"],
},
+
+ linux_bionic: {
+ header_libs: ["bionic_libc_platform_headers"],
+ },
},
export_include_dirs: ["."],