Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77cbe10f authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Use Jack launcher 

Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
parent cbdd2c34

core/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -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),)

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/host_dalvik_static_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -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