diff options
-rw-r--r-- | core-stubs-mini/Android.mk | 6 | ||||
-rw-r--r-- | hamcrest-core/Android.mk | 6 | ||||
-rw-r--r-- | jack-tests/build/run-test-common.mk | 2 | ||||
-rw-r--r-- | jack/Android.mk | 24 | ||||
-rwxr-xr-x | jack/run-jack-unit-tests | 2 | ||||
-rw-r--r-- | junit4/Android.mk | 5 |
6 files changed, 19 insertions, 26 deletions
diff --git a/core-stubs-mini/Android.mk b/core-stubs-mini/Android.mk index 28623ae0..e41ce5a5 100644 --- a/core-stubs-mini/Android.mk +++ b/core-stubs-mini/Android.mk @@ -25,9 +25,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= core-stubs-mini include $(BUILD_JAVA_LIBRARY) -$(LOCAL_BUILT_MODULE):PRIVATE_DEST:=$(LOCAL_PATH) -$(LOCAL_BUILT_MODULE):PRIVATE_CLASSES_JAR:=$(full_classes_jar) -$(LOCAL_BUILT_MODULE): $(common_javalib.jar) - $(copy-file-to-target) - mkdir -p $(dir $(PRIVATE_DEST)/../jack/libs/) - cp $(PRIVATE_CLASSES_JAR) $(PRIVATE_DEST)/../jack/libs/core-stubs-mini.jar diff --git a/hamcrest-core/Android.mk b/hamcrest-core/Android.mk index e41fbde8..287aaea1 100644 --- a/hamcrest-core/Android.mk +++ b/hamcrest-core/Android.mk @@ -20,13 +20,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := hamcrest-core-hostdex-jack -LOCAL_BUILD_HOST_DEX := true - -LOCAL_JAVA_LIBRARIES := core-hostdex - LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_JAVA_LIBRARY) +include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) diff --git a/jack-tests/build/run-test-common.mk b/jack-tests/build/run-test-common.mk index 38f7a2dc..33d106a0 100644 --- a/jack-tests/build/run-test-common.mk +++ b/jack-tests/build/run-test-common.mk @@ -25,7 +25,7 @@ $(call _java-lib-dir,$(1),$(2))/classes.dex endef jack.intermediate := $(call intermediates-dir-for,JAVA_LIBRARIES,jack,1,COMMON) -BOOTCLASSPATH_MODULE := core-hostdex junit4-hostdex-jack +BOOTCLASSPATH_MODULE := core-libart-hostdex junit4-hostdex-jack BOOTCLASSPATH_LIBS := $(call java-lib-files,$(BOOTCLASSPATH_MODULE),true) BOOTCLASSPATH_DEX := $(call java-dex-files,$(BOOTCLASSPATH_MODULE),true) junit.dex = \ diff --git a/jack/Android.mk b/jack/Android.mk index 1e8e794c..040698f1 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -18,6 +18,12 @@ LOCAL_PATH:= $(call my-dir) # Build Jack # +# $(1): library name +# $(2): Non-empty if IS_HOST_MODULE +define java-lib-libs +$(foreach lib,$(1),$(call _java-lib-dir,$(lib),$(2))/$(if $(2),javalib,classes)$(COMMON_JAVA_PACKAGE_SUFFIX)) +endef + include $(CLEAR_VARS) JACK_BASE_VERSION_NAME := 0.1 @@ -44,8 +50,8 @@ GEN_PP := $(addprefix $(preprocessor_intermediates)/, \ PreProcessor_Java.java \ ) -ANTLR_JACK_JAR = $(call java-lib-deps,antlr-jack,true) - +ANTLR_JACK_JAR = $(call java-lib-libs,antlr-jack,true) +$(info ANTLR_JACK_JAR = $(ANTLR_JACK_JAR)) $(GEN_PG): $(ANTLR_JACK_JAR) $(GEN_PG): PRIVATE_PATH := $(LOCAL_PATH) $(GEN_PG): PRIVATE_CUSTOM_TOOL = java -jar $(ANTLR_JACK_JAR) -fo $(dir $@) $< @@ -99,12 +105,12 @@ $(intermediates)/rsc/jack.properties: LOCAL_JAVA_RESOURCE_FILES := $(intermediates)/rsc/jack.properties +LOCAL_POST_INSTALL_CMD := java -jar $(call java-lib-libs,sched-build,true) $(call java-lib-libs,$(LOCAL_MODULE),true) $(call java-lib-libs,$(JACK_STATIC_JAVA_LIBRARIES),true) $(JACK_JAR) + include $(BUILD_HOST_JAVA_LIBRARY) # Merge with sched lib support -$(LOCAL_BUILT_MODULE): PRIVATE_JACK := $(full_classes_compiled_jar) -$(LOCAL_BUILT_MODULE): $(PRIVATE_JACK) $(call java-lib-deps,$(JACK_STATIC_JAVA_LIBRARIES),true) $(call java-lib-deps,sched-build,true) - java -jar $(call java-lib-deps,sched-build,true) $(PRIVATE_JACK) $(call java-lib-deps,$(JACK_STATIC_JAVA_LIBRARIES),true) $@ +$(LOCAL_BUILT_MODULE): $(call java-lib-libs,sched-build,true) # Include this library in the build server's output directory $(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE):jack.jar) @@ -144,12 +150,12 @@ LOCAL_REQUIRED_MODULES:= \ android.policy \ hamcrest-core-jack +LOCAL_POST_INSTALL_CMD := java -jar $(call java-lib-libs,sched-build,true) $(call java-lib-libs,$(LOCAL_MODULE),true) $(call java-lib-libs,$(TEST_STATIC_JAVA_LIBRARIES),true) $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) + include $(BUILD_HOST_JAVA_LIBRARY) # Merge with sched lib support -$(LOCAL_BUILT_MODULE): PRIVATE_JACK := $(full_classes_compiled_jar) -$(LOCAL_BUILT_MODULE): $(PRIVATE_JACK) $(call java-lib-deps,$(TEST_STATIC_JAVA_LIBRARIES),true) $(call java-lib-deps,sched-build,true) - java -jar $(call java-lib-deps,sched-build,true) $(PRIVATE_JACK) $(call java-lib-deps,$(TEST_STATIC_JAVA_LIBRARIES),true) $@ +$(LOCAL_BUILT_MODULE): $(call java-lib-libs,sched-build,true) # # Test targets @@ -157,7 +163,7 @@ $(LOCAL_BUILT_MODULE): $(PRIVATE_JACK) $(call java-lib-deps,$(TEST_STATIC_JAVA_L LIB_JACK_UNIT_TESTS := $(LOCAL_BUILT_MODULE) -local_unit_libs := $(call java-lib-files,core-hostdex junit4-hostdex-jack,true) +local_unit_libs := $(call java-lib-files,core-libart-hostdex junit4-hostdex-jack,true) .PHONY: test-jack-unit test-jack-unit: PRIVATE_RUN_TESTS := ./run-jack-unit-tests test-jack-unit: PRIVATE_PATH := $(LOCAL_PATH) diff --git a/jack/run-jack-unit-tests b/jack/run-jack-unit-tests index 0e203ebf..966e3a86 100755 --- a/jack/run-jack-unit-tests +++ b/jack/run-jack-unit-tests @@ -23,5 +23,5 @@ then fi REF_JAVA_COMPILER='javac' \ -java -cp ${ANDROID_BUILD_TOP}/out/host/common/obj/JAVA_LIBRARIES/libjackunittests_intermediates/javalib.jar \ +java -cp ${ANDROID_BUILD_TOP}/out/host/linux-x86/framework/libjackunittests.jar \ org.junit.runner.JUnitCore $1 diff --git a/junit4/Android.mk b/junit4/Android.mk index 321f2fa4..65add687 100644 --- a/junit4/Android.mk +++ b/junit4/Android.mk @@ -31,8 +31,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) -LOCAL_JAVA_LIBRARIES := core-hostdex - LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-core-hostdex-jack LOCAL_MODULE := junit4-hostdex-jack @@ -41,8 +39,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_BUILD_HOST_DEX := true -include $(BUILD_HOST_JAVA_LIBRARY) - +include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) include $(CLEAR_VARS) |