diff options
| author | 2021-11-03 18:40:17 +0000 | |
|---|---|---|
| committer | 2021-11-09 15:30:21 +0000 | |
| commit | b747b7aa66e41160e5811ab824f93a38b2bf4ef3 (patch) | |
| tree | 4f7b551f53657f077abb3f60281ea63903bb8cda | |
| parent | dc7f139c99987f7029ec5dfb8b69cf45e788435d (diff) | |
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
| -rw-r--r-- | build/Android.bp | 10 | ||||
| -rw-r--r-- | runtime/Android.bp | 13 | ||||
| -rw-r--r-- | sigchainlib/Android.bp | 5 |
3 files changed, 18 insertions, 10 deletions
diff --git a/build/Android.bp b/build/Android.bp index ad27d4252d..e54e2d3af8 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -173,11 +173,6 @@ art_module_art_global_defaults { // "-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 @@ art_module_art_global_defaults { ], }, 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 be060c9403..7d793a6437 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -78,6 +78,19 @@ cc_library_headers { 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 f8c8379907..ee874dc0b7 100644 --- a/sigchainlib/Android.bp +++ b/sigchainlib/Android.bp @@ -49,8 +49,13 @@ cc_library { }, android: { + header_libs: ["bionic_libc_platform_headers"], static_libs: ["libasync_safe"], }, + + linux_bionic: { + header_libs: ["bionic_libc_platform_headers"], + }, }, export_include_dirs: ["."], |