Restore build-art minimal build

Change-Id: I0f4f2e8c6d2505a339cb9a1175d30ed9b229c45d

4 files changed, 36 insertions, 24 deletions

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)/runtime/Android.mk
 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 @@ ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TARGET_TEST_EXE
 
 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 @@ oat-target-sync: oat-target
 	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 @@ use-dalvik:
 
 ########################################################################
 
-include $(art_path)/dalvikvm/Android.mk
-include $(art_path)/jdwpspy/Android.mk
-
 endif # !art_dont_bother
diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index fe540c0..5cf15be 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -16,8 +16,8 @@
 
 include art/build/Android.common.mk
 
-ART_HOST_EXECUTABLES :=
-ART_TARGET_EXECUTABLES :=
+ART_HOST_EXECUTABLES ?=
+ART_TARGET_EXECUTABLES ?=
 
 ART_EXECUTABLES_CFLAGS :=
 ifeq ($(ART_USE_PORTABLE_COMPILER),true)
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index d85d5fb..52584cf 100644
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := libdl libnativehelper
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include external/stlport/libstlport.mk
 include $(BUILD_EXECUTABLE)
+ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE)
 
 ifeq ($(WITH_HOST_DALVIK),true)
 include $(CLEAR_VARS)
@@ -40,4 +41,5 @@ LOCAL_SHARED_LIBRARIES := libnativehelper
 LOCAL_LDFLAGS := -ldl
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_HOST_EXECUTABLE)
+ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)
 endif
diff --git a/jdwpspy/Android.mk b/jdwpspy/Android.mk
index 5523bfd..97162f0 100644
--- a/jdwpspy/Android.mk
+++ b/jdwpspy/Android.mk
@@ -1,17 +1,25 @@
-# Copyright 2006 The Android Open Source Project
+#
+# Copyright (C) 2006 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	Main.cpp \
-	Net.cpp
-
-LOCAL_C_INCLUDES += \
-	art/runtime
 
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES:= Main.cpp Net.cpp
+LOCAL_C_INCLUDES += art/runtime
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-
 LOCAL_MODULE := jdwpspy
-
 include $(BUILD_HOST_EXECUTABLE)
+ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)