diff options
| -rw-r--r-- | build/Android.common_path.mk | 12 | ||||
| -rw-r--r-- | build/Android.executable.mk | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 2faa75ca36..86bb475f33 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -113,16 +113,4 @@ ifdef TARGET_2ND_ARCH ART_TARGET_SHARED_LIBRARY_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(2ND_TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) endif -ART_CORE_EXECUTABLES := \ - dex2oat \ - imgdiag \ - oatdump \ - patchoat \ - profman \ - -# Depend on the -target or -host phony targets generated by the build system -# for each module -ART_TARGET_EXECUTABLES := $(foreach name,$(ART_CORE_EXECUTABLES),$(name)-target) -ART_HOST_EXECUTABLES := $(foreach name,$(ART_CORE_EXECUTABLES),$(name)-host) - endif # ART_ANDROID_COMMON_PATH_MK diff --git a/build/Android.executable.mk b/build/Android.executable.mk index e66b30cfaf..2db16af4c0 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -16,6 +16,9 @@ include art/build/Android.common_build.mk +ART_HOST_EXECUTABLES ?= +ART_TARGET_EXECUTABLES ?= + ART_EXECUTABLES_CFLAGS := # $(1): executable ("d" will be appended for debug version) @@ -166,9 +169,11 @@ define build-art-executable ifeq ($$(art_target_or_host),target) include $(BUILD_EXECUTABLE) + ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $$(foreach name,$$(art_out_binary_name),$(TARGET_OUT_EXECUTABLES)/$$(name)) else # host LOCAL_IS_HOST_MODULE := true include $(BUILD_HOST_EXECUTABLE) + ART_HOST_EXECUTABLES := $(ART_HOST_EXECUTABLES) $$(foreach name,$$(art_out_binary_name),$(HOST_OUT_EXECUTABLES)/$$(name)) endif # Clear out local variables now that we're done with them. |