diff options
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | core/host_dalvik_java_library.mk | 2 | ||||
| -rw-r--r-- | core/host_dalvik_static_java_library.mk | 2 | ||||
| -rw-r--r-- | core/java.mk | 2 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/core/config.mk b/core/config.mk index cbe1227..3c8297d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -377,6 +377,7 @@ endif # Generic tools. JACK := $(HOST_OUT_EXECUTABLES)/jack JACK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack.jar +JACK_LAUNCHER_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack-launcher.jar JILL_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jill.jar JACK_MULTIDEX_DEFAULT_PREPROCESSOR := frameworks/multidex/library/resources/JACK-INF/legacyMultidexInstallation.jpp @@ -441,7 +442,7 @@ ifneq (,$(strip $(filter dist,$(MAKECMDGOALS)))) JACK_SERVER_LOG_COMMAND := mkdir -p $(DIST_DIR)/logs/; SERVER_LOG=$(DIST_DIR)/logs/jack-server.log endif define call-jack -$(JACK_SERVER_LOG_COMMAND) JACK_VM_COMMAND="$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG)" JACK_JAR="$(JACK_JAR)" $(JACK) $(2) +$(JACK_SERVER_LOG_COMMAND) JACK_VM_COMMAND="$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG) -jar $(JACK_LAUNCHER_JAR) " JACK_JAR="$(JACK_JAR)" $(JACK) $(2) endef $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) ifneq ($(ANDROID_JACK_VM_ARGS),) diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 9ee1183..ff5ee1e 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -129,7 +129,7 @@ $(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack) $(built_dex): PRIVATE_JACK_FLAGS := $(LOCAL_JACK_FLAGS) $(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \ $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_MODULE_MAKEFILE) \ - $(LOCAL_MODULE_MAKEFILE) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_JAR) + $(LOCAL_MODULE_MAKEFILE) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_JAR) $(JACK_LAUNCHER_JAR) @echo Building with Jack: $@ $(jack-java-to-dex) diff --git a/core/host_dalvik_static_java_library.mk b/core/host_dalvik_static_java_library.mk index 410b251..90bcc12 100644 --- a/core/host_dalvik_static_java_library.mk +++ b/core/host_dalvik_static_java_library.mk @@ -48,7 +48,7 @@ endif $(full_classes_jack): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \ $(jar_manifest_file) $(layers_file) $(LOCAL_MODULE_MAKEFILE) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \ - $(JACK_JAR) + $(JACK_JAR) $(JACK_LAUNCHER_JAR) @echo Building with Jack: $@ $(java-to-jack) diff --git a/core/java.mk b/core/java.mk index 0d4241e..02745a8 100644 --- a/core/java.mk +++ b/core/java.mk @@ -598,7 +598,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_FLAGS := $(LOCAL_JACK_FLAGS) jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \ $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \ $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \ - $(LOCAL_MODULE_MAKEFILE) $(JACK_JAR) + $(LOCAL_MODULE_MAKEFILE) $(JACK_JAR) $(JACK_LAUNCHER_JAR) ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true) $(full_classes_jack): $(jack_all_deps) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index ca6e06a..5e9f5ab 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -296,7 +296,7 @@ endif # TARGET JAVA_LIBRARIES ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) $(intermediates.COMMON)/classes.jack : PRIVATE_JILL_FLAGS:=$(LOCAL_JILL_FLAGS) $(intermediates.COMMON)/classes.jack : $(my_prebuilt_src_file) $(LOCAL_MODULE_MAKEFILE) \ - $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK_JAR) + $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK_JAR) $(JACK_LAUNCHER_JAR) $(transform-jar-to-jack) endif # JAVA_LIBRARIES |