ART: change art-tools be host-only
Changes art-tools make target to require host modules. Device
equivalents are now build by art/build/apex/Android.bp.
Bug: 128990084
Test: m art-tools
Change-Id: Iacb61c75b31422566a197839a5c9efa2d5ac0656
diff --git a/Android.mk b/Android.mk
index 24fab9e..2a74415 100644
--- a/Android.mk
+++ b/Android.mk
@@ -441,12 +441,12 @@
include $(BUILD_PHONY_PACKAGE)
-# The art-tools package depends on helpers and tools that are useful for developers and on-device
-# investigations.
+# The art-tools package depends on helpers and tools that are useful for developers. Similar
+# dependencies exist for the APEX builds for these tools (see build/apex/Android.bp).
include $(CLEAR_VARS)
LOCAL_MODULE := art-tools
-LOCAL_REQUIRED_MODULES := \
+LOCAL_HOST_REQUIRED_MODULES := \
ahat \
dexdiag \
dexdump \
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 0ff1cbd..7192825 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -69,14 +69,14 @@
"apex_icu.dat",
]
-// Modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
+// Tools common to both device APEX and host APEX. Derived from art-tools in art/Android.mk.
art_tools_common_binaries = [
"dexdiag",
"dexdump",
"dexlist",
]
-// Device-only modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
+// Tools exclusively for the device APEX derived from art-tools in art/Android.mk.
art_tools_device_only_binaries = [
// oatdump cannot link with host linux_bionic due to not using clang lld;
// TODO: Make it work with clang lld.
@@ -89,7 +89,7 @@
"oatdumpd",
]
-// Host-only modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
+// Tools exclusively for the host APEX derived from art-tools in art/Android.mk.
art_tools_host_only_binaries = [
// FIXME: Does not work as-is, because `ahat` is defined in tools/ahat/Android.mk
// (same issue as for `libart_fake` above).