Always include `libart(d)-disassembler` in debug-able ART APEXes.
Library `libart(d)-disassembler` is required to execute some ART
run-tests (it's used to output disassembly information of compiled
methods to verify Checker `disassembly` checks); but it is dlopen'd by
`art::HGraphVisualizerDisassembler` (and not linked with
`libart(d)-compiler`). Make it an explicit dependency of all ART APEX
packages used for debugging or testing.
Test: art/build/apex/runtests.sh
Test: art/test/testrunner/testrunner.py --target --64 --ndebug --debug -t 1004-checker-volatile-ref-load
Bug: 140507091
Change-Id: I0ae206a26a873487d4415bb49b16e14718448ff5
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 79b0c48..b46f038 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -594,10 +594,12 @@
# Check internal libraries for ART.
self._checker.check_native_library('libadbconnectiond')
+ self._checker.check_native_library('libart-disassembler')
self._checker.check_native_library('libartbased')
self._checker.check_native_library('libartd')
self._checker.check_native_library('libartd-compiler')
self._checker.check_native_library('libartd-dexlayout')
+ self._checker.check_native_library('libartd-disassembler')
self._checker.check_native_library('libdexfiled')
self._checker.check_native_library('libopenjdkjvmd')
self._checker.check_native_library('libopenjdkjvmtid')
@@ -621,7 +623,6 @@
# Check ART internal libraries.
self._checker.check_native_library('libdexfiled_external')
- self._checker.check_prefer64_library('libartd-disassembler')
self._checker.check_native_library('libperfetto_hprofd')
# Check internal native library dependencies.
@@ -898,7 +899,6 @@
# Check ART test (internal) libraries.
self._checker.check_native_library('libart-gtest')
- self._checker.check_native_library('libartd-disassembler')
self._checker.check_native_library('libartd-simulator-container')
# Check ART test tools.