Convert libdexfile_support_static to *_static_defaults modules.
It has been using whole_static_libs to propagate static library
dependencies transitively, but that can lead to duplicate instances of
them. Instead provide libdexfile(d)_support_static_defaults that
collect dependencies just like elsewhere in ART.
External packages (read simpleperf) that depend on static libdexfile
are provided a separate libdexfile_external_static library. It only
contains the internal dependencies and have a corresponding
*_static_defaults for the external ones, and hence shouldn't be used
internally.
Test: flash & boot
Test: art/build/apex/runtests.sh
Test: art/tools/buildbot-build.sh {--host,--target}
Test: m build-art-target-golem
Test: atest --host art_libdexfile_support_tests \
art_libdexfile_support_static_tests \
art_libdexfile_external_static_tests
Bug: 145934348
Bug: 142944931
Change-Id: Ic99eebccc5c63acb55f323611c6b6f50a83eba5a
diff --git a/runtime/Android.bp b/runtime/Android.bp
index cd3c812..96172d1 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -486,11 +486,11 @@
"libart_static_base_defaults",
"libartbase_static_defaults",
"libdexfile_static_defaults",
+ "libdexfile_support_static_defaults",
"libprofile_static_defaults",
],
static_libs: [
"libart",
- "libdexfile_support_static",
"libelffile",
],
}
@@ -501,11 +501,11 @@
"libart_static_base_defaults",
"libartbased_static_defaults",
"libdexfiled_static_defaults",
+ "libdexfiled_support_static_defaults",
"libprofiled_static_defaults",
],
static_libs: [
"libartd",
- "libdexfiled_support_static",
"libelffiled",
],
}