Avoid linking libdexfile_support into static executables.
It doesn't define -DSTATIC_LIB, so it ends up compiling in dlopen() calls
that don't work in static executables. Use libdexfile_support_static
instead, which is intended for this use. That also requires adding a
corresponding libdexfiled_support_static.
This also fixes d/non-d library mixup because libdexfile_{external,support}
which depend on non-d libs were used in libartd_static_defaults.
Test: Build & boot
Test: art/test/run-test --chroot /data/local/art-test-chroot --jit --64 --timeout 5 151-OpenFileLimit
and check that logcat has signal_dumper output without any fatal error
Bug: 141485154
Change-Id: I8005373814d73ceefc2891a77204d4ba89abb922
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 22dc208..477362b 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -429,8 +429,6 @@
"libartpalette",
"libbacktrace",
"libbase",
- "libdexfile_external", // libunwindstack dependency
- "libdexfile_support", // libunwindstack dependency
"liblog",
"libnativebridge",
"libnativeloader",
@@ -450,6 +448,7 @@
],
static_libs: [
"libart",
+ "libdexfile_support_static",
"libelffile",
],
}
@@ -464,6 +463,7 @@
],
static_libs: [
"libartd",
+ "libdexfiled_support_static",
"libelffiled",
],
}