Drop whole_static_libs for libasync_safe and clean up static linking of
libsigchain.
whole_static_libs is no longer necessary when libsigchain is a DSO, and
this avoids reexporting all the Bionic headers in the ART SDK.
Test: build/soong/scripts/build-aml-prebuilts.sh art-module-sdk
unzip -v out/aml/soong/mainline-sdks/art-module-sdk-current.zip
Check that no Bionic headers are left.
Test: m droid continuous_instrumentation_tests \
continuous_instrumentation_tests_api_coverage \
continuous_native_tests device-tests platform_tests
Bug: 142944043
Change-Id: If0982e8bd72f74ed12c270361579e81101de3612
diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp
index 5baba87..b3dd7e2 100644
--- a/sigchainlib/Android.bp
+++ b/sigchainlib/Android.bp
@@ -49,7 +49,7 @@
},
android: {
- whole_static_libs: ["libasync_safe"],
+ static_libs: ["libasync_safe"],
},
},
@@ -74,7 +74,7 @@
srcs: ["sigchain_fake.cc"],
target: {
android: {
- whole_static_libs: ["libasync_safe"],
+ static_libs: ["libasync_safe"],
},
},
@@ -87,5 +87,5 @@
"art_gtest_defaults",
],
srcs: ["sigchain_test.cc"],
- whole_static_libs: ["libsigchain"],
+ shared_libs: ["libsigchain"],
}
diff --git a/test/Android.bp b/test/Android.bp
index fd6c3b4..af3aa21 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -81,9 +81,6 @@
"libnativehelper",
"libz",
],
- whole_static_libs: [
- "libsigchain",
- ],
target: {
linux: {