Make `libart(d)-disassembler` a requirement of `libart(d)-compiler`.
The constructor of `art::HGraphVisualizerDisassembler` (which is part
of `libart(d)-compiler.so`) may dynamically load
`libart(d)-disassembler.so`; add `libart(d)-disassembler` to the
`runtime_libs` property of module `libart(d)-compiler` to make sure
the former can be found.
Also promote the failure to dynamically load
`libart(s)-disassembler.so` in
`art::HGraphVisualizerDisassembler::HGraphVisualizerDisassembler` from
`WARNING` to `ERROR`.
Test: art/tools/buildbot-build.sh --host \
&& art/test/testrunner/testrunner.py --host --optimizing \
-t 640-checker-integer-valueof
Bug: 149749169
Change-Id: I307bdf8b71e47ed8da1d6d62ab688c500b3f9c80
diff --git a/compiler/Android.bp b/compiler/Android.bp
index c7a6ec2..cbfff89 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -234,6 +234,11 @@
"libdexfile",
],
whole_static_libs: ["libelffile"],
+ runtime_libs: [
+ // `art::HGraphVisualizerDisassembler::HGraphVisualizerDisassembler` may dynamically load
+ // `libart-disassembler.so`.
+ "libart-disassembler",
+ ],
target: {
android: {
@@ -310,6 +315,12 @@
"libdexfiled",
],
whole_static_libs: ["libelffiled"],
+ runtime_libs: [
+ // `art::HGraphVisualizerDisassembler::HGraphVisualizerDisassembler` may dynamically load
+ // `libartd-disassembler.so`.
+ "libartd-disassembler",
+ ],
+
apex_available: [
"com.android.art.debug",
],