Restore build-art minimal build
Change-Id: I0f4f2e8c6d2505a339cb9a1175d30ed9b229c45d
diff --git a/Android.mk b/Android.mk
index 7638be9..a051152 100644
--- a/Android.mk
+++ b/Android.mk
@@ -86,6 +86,8 @@
include $(art_path)/compiler/Android.mk
include $(art_path)/dex2oat/Android.mk
include $(art_path)/oatdump/Android.mk
+include $(art_path)/dalvikvm/Android.mk
+include $(art_path)/jdwpspy/Android.mk
include $(art_build_path)/Android.oat.mk
# ART_HOST_DEPENDENCIES depends on Android.executable.mk above for ART_HOST_EXECUTABLES
@@ -107,14 +109,6 @@
include $(art_build_path)/Android.libarttest.mk
-# "m build-art" for quick minimal build
-.PHONY: build-art
-build-art: \
- $(ART_TARGET_EXECUTABLES) \
- $(ART_TARGET_TEST_EXECUTABLES) \
- $(ART_HOST_EXECUTABLES) \
- $(ART_HOST_TEST_EXECUTABLES)
-
# "mm test-art" to build and run all tests on host and device
.PHONY: test-art
test-art: test-art-host test-art-target
@@ -290,6 +284,17 @@
adb sync
########################################################################
+# "m build-art" for quick minimal build
+.PHONY: build-art
+build-art: build-art-host build-art-target
+
+.PHONY: build-art-host
+build-art-host: $(ART_HOST_EXECUTABLES) $(ART_HOST_TEST_EXECUTABLES) $(HOST_CORE_IMG_OUT) $(HOST_OUT)/lib/libjavacore.so
+
+.PHONY: build-art-target
+build-art-target: $(ART_TARGET_EXECUTABLES) $(ART_TARGET_TEST_EXECUTABLES) $(TARGET_CORE_IMG_OUT) $(TARGET_OUT)/lib/libjavacore.so
+
+########################################################################
# oatdump targets
.PHONY: dump-oat
@@ -354,7 +359,4 @@
########################################################################
-include $(art_path)/dalvikvm/Android.mk
-include $(art_path)/jdwpspy/Android.mk
-
endif # !art_dont_bother