Add more tools to the Debug and Host Runtime APEXes.
Add the following tools:
- dexanalyze
- dexlayout
- dexlayoutd
- imgdiag
- imgdiagd
Test: art/build/apex/runtests.sh
Bug: 135274972
Change-Id: Ibf53ab79d3c752013eaf5cbf03f6e5a75c29b7a4
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 5610a61..fcd6434 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -94,7 +94,15 @@
// Tools common to both device and host debug APEXes.
art_tools_debug_binaries = [
+ "dexanalyze",
"dexdiag",
+ "dexlayout",
+ "dexlayoutd",
+]
+
+art_tools_debug_binaries_both = [
+ "imgdiag",
+ "imgdiagd",
]
// Tools exclusively for the device APEX derived from art-tools in art/Android.mk.
@@ -251,6 +259,9 @@
libcore_debug_native_shared_libs +
bionic_native_shared_libs_device,
multilib: {
+ both: {
+ binaries: art_tools_debug_binaries_both,
+ },
prefer32: {
binaries: art_runtime_debug_binaries_prefer32 +
art_runtime_debug_binaries_prefer32_device,
@@ -286,7 +297,8 @@
multilib: {
both: {
binaries: art_runtime_base_binaries_both +
- art_runtime_debug_binaries_both_host,
+ art_runtime_debug_binaries_both_host +
+ art_tools_debug_binaries_both,
},
first: {
binaries: art_tools_common_binaries + // Host APEX is always debug.
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 5e4954e..94e86cb 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -521,9 +521,14 @@
def run(self):
# Check binaries for ART.
self._checker.check_executable('dexdiag')
+ self._checker.check_executable('dexanalyze')
+ self._checker.check_executable('dexlayout')
+ self._checker.check_symlinked_multilib_executable('imgdiag')
# Check debug binaries for ART.
+ self._checker.check_executable('dexlayoutd')
self._checker.check_executable('dexoptanalyzerd')
+ self._checker.check_symlinked_multilib_executable('imgdiagd')
self._checker.check_executable('profmand')
# Check internal libraries for ART.
