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

Commit e0c7b4ec authored by Yohann Roussel's avatar Yohann Roussel Committed by Gerrit Code Review
Browse files

Merge changes from topic 'jack-server-1.3-a3' 

* changes:
  Remove LOCAL_JACK_EXTRA_ARGS
  Allow control of jack used for compilation
  Clean call-jack and its callers
parents c5a33b05 6528ea30

core/clear_vars.mk

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ LOCAL_ADDITIONAL_JAVA_DIR:= 
LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_DX_FLAGS:=

LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental

LOCAL_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)

LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)

LOCAL_JACK_FLAGS:=

LOCAL_JILL_FLAGS:=

LOCAL_CERTIFICATE:=

core/config.mk

+0 −23
Original line number Diff line number Diff line
@@ -427,9 +427,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



LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39

# The default PKGDATADIR built in the prebuilt bison is a relative path
@@ -488,27 +486,6 @@ DEFAULT_JACK_ENABLED:=full 
else

DEFAULT_JACK_ENABLED:=

endif

ifneq ($(strip $(ANDROID_JACK_VM)),)

JACK_VM := $(ANDROID_JACK_VM)

else

JACK_VM := java

endif

# call jack

#

# $(1): vm arguments

# $(2): jack perf arguments

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) -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),)

DEFAULT_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS)

else

DEFAULT_JACK_VM_ARGS := -Dfile.encoding=UTF-8 -Xms2560m -XX:+TieredCompilation

endif

ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)

else

core/configure_local_jack.mk

+8 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
ifdef ANDROID_FORCE_JACK_ENABLED

LOCAL_JACK_ENABLED := $(ANDROID_FORCE_JACK_ENABLED)

endif



LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))



ifneq ($(LOCAL_JACK_ENABLED),full)

ifneq ($(LOCAL_JACK_ENABLED),incremental)

ifdef LOCAL_JACK_ENABLED
@@ -28,3 +30,9 @@ endif 
LOCAL_JACK_ENABLED :=

endif

endif



ifdef $(LOCAL_MODULE).JACK_VERSION

LOCAL_JACK_VERSION := $($(LOCAL_MODULE).JACK_VERSION)

else

LOCAL_JACK_VERSION := $(JACK_DEFAULT_VERSION)

endif

core/definitions.mk

+10 −4
Original line number Diff line number Diff line
@@ -1777,6 +1777,12 @@ define unzip-jar-files 
  $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,;rm -rf $(2)/META-INF)

endef



# Call jack

#

define call-jack

 JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(DEFAULT_JACK_EXTRA_ARGS)

endef



# Common definition to invoke javac on the host and target.

#

# Some historical notes:
@@ -1877,7 +1883,7 @@ $(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then 
else \

    export tmpEcjArg=""; \

fi; \

$(call call-jack,$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

$(call call-jack) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \
@@ -1896,7 +1902,7 @@ $(call call-jack,$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \ 
    $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \

    $(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \

    $$tmpEcjArg \

    || ( rm -rf $(PRIVATE_CLASSES_JACK); rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR); exit 41 )

    || ( rm -rf $(PRIVATE_CLASSES_JACK); exit 41 )

$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/classes*.dex $(dir $@)

$(hide) rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(hide) rm -rf $@.res.tmp)
@@ -1912,7 +1918,7 @@ define transform-jar-to-jack 
	$(hide) mkdir -p $@.tmpjill.res

	$(hide) $(call unzip-jar-files,$<,$@.tmpjill.res)

	$(hide) find $@.tmpjill.res -iname "*.class" -delete

	$(hide) $(call call-jack,$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

	$(hide) $(call call-jack) \

        -D jack.import.resource.policy=keep-first \

        -D jack.import.type.policy=keep-first \

	    --import $@.tmpjill.jack \
@@ -1956,7 +1962,7 @@ $(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then 
else \

    export tmpEcjArg=""; \

fi; \

$(call call-jack,$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

$(call call-jack) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \

core/host_dalvik_java_library.mk

+2 −1
Original line number Diff line number Diff line
@@ -123,9 +123,10 @@ endif 


$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

$(built_dex): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)

$(built_dex): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)

$(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_MODULE_MAKEFILE_DEP) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_JAR) $(JACK_LAUNCHER_JAR)

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK)

	@echo Building with Jack: $@

	$(jack-java-to-dex)