diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-02 15:51:27 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-10-23 18:42:29 +0200 |
| commit | 74e89c3ba81b93290b7f5a423416669f8e297d73 (patch) | |
| tree | 3b0d79def4ea5e6ef6705bb6e513afb9d52d9024 /jack/Android.mk | |
| parent | dee2472546a6570f51cea4b0334bbfdcca392498 (diff) | |
| download | toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.zip toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.tar.gz toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.tar.bz2 | |
Adapt to lmp changes
Build has changed,
Libcore targets were renamed.
This allows to build the images or to mm in toolchain/jack but not to run
test-jack.
Conflicts:
junit4/Android.mk
Change-Id: Idcf3076569c2712560d59165d664b9c9a4e15a1b
Diffstat (limited to 'jack/Android.mk')
| -rw-r--r-- | jack/Android.mk | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/jack/Android.mk b/jack/Android.mk index 1e8e794..040698f 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) |