Link libart-disassembler statically into static libart-compiler.
Necessary to avoid runtime dlopen of non-existing
libart(d)-disassembler.so in host dex2oat. This increases the stripped
dex2oat binary size by 4.8% or ~800 KB.
Test: art/tools/buildbot-build.sh --host && \
art/test/testrunner/testrunner.py --optimizing --host --ndebug -t 465
with and without HOST_PREFER_32_BIT=true
Bug: 145934348
Change-Id: I623019132175bd0430d30a421655484bdcb71857
diff --git a/disassembler/Android.bp b/disassembler/Android.bp
index 064aaea..452e883 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -58,6 +58,14 @@
],
}
+cc_defaults {
+ name: "libart-disassembler_static_defaults",
+ whole_static_libs: [
+ "libart-disassembler",
+ "libvixl",
+ ],
+}
+
art_cc_library {
name: "libartd-disassembler",
defaults: [
@@ -75,6 +83,14 @@
],
}
+cc_defaults {
+ name: "libartd-disassembler_static_defaults",
+ whole_static_libs: [
+ "libartd-disassembler",
+ "libvixld",
+ ],
+}
+
cc_library_headers {
name: "art_disassembler_headers",
host_supported: true,