Add test dependency on dexlist
dexlist_test depends on dexlist, add a new list of non-debuggable
executables for tests to depend on.
Bug: 31469510
Change-Id: I3e8f5798be523753ed8eda6cbbabe3251436877f
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index e88d027..00d29b9 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -114,29 +114,33 @@
ART_TARGET_SHARED_LIBRARY_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(2ND_TARGET_OUT_SHARED_LIBRARIES)/$(lib).so)
endif
-ART_CORE_EXECUTABLES := \
+ART_CORE_DEBUGGABLE_EXECUTABLES := \
dex2oat \
imgdiag \
oatdump \
patchoat \
profman \
+ART_CORE_EXECUTABLES := \
+ dalvikvm \
+ dexlist \
+
# Depend on the -target or -host phony targets generated by the build system
# for each module
-ART_TARGET_EXECUTABLES := dalvikvm-target
+ART_TARGET_EXECUTABLES :=
ifneq ($(ART_BUILD_TARGET_NDEBUG),false)
-ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES),$(name)-target)
+ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES) $(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)-target)
endif
ifneq ($(ART_BUILD_TARGET_DEBUG),false)
-ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES),$(name)d-target)
+ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)d-target)
endif
-ART_HOST_EXECUTABLES := dalvikvm-host
+ART_HOST_EXECUTABLES :=
ifneq ($(ART_BUILD_HOST_NDEBUG),false)
-ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES),$(name)-host)
+ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES) $(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)-host)
endif
ifneq ($(ART_BUILD_HOST_DEBUG),false)
-ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES),$(name)d-host)
+ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)d-host)
endif
endif # ART_ANDROID_COMMON_PATH_MK
