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

Commit 4283c367 authored by Yohann Roussel's avatar Yohann Roussel Committed by Android (Google) Code Review
Browse files

Merge "Simplify handling of ANDROID_JACK_* variables"

parents 18202932 28096669

core/base_rules.mk

+0 −19
Original line number Diff line number Diff line
@@ -706,27 +706,8 @@ endif # LOCAL_SDK_VERSION 
endif # TARGET_



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)

ifneq ($(ANDROID_JACK_VM_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS)

endif

ifneq ($(LOCAL_JACK_VM_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(LOCAL_JACK_VM_ARGS)

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)

ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)

endif

ifneq ($(LOCAL_JACK_EXTRA_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(LOCAL_JACK_EXTRA_ARGS)

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM := $(DEFAULT_JACK_VM)

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

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM := $(ANDROID_JACK_VM)

endif



ifdef LOCAL_IS_HOST_MODULE

ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

core/clear_vars.mk

+3 −3
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ LOCAL_ADDITIONAL_JAVA_DIR:= 
LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_DX_FLAGS:=

LOCAL_USE_JACK:= $(ANDROID_COMPILE_WITH_JACK)

LOCAL_JACK_VM_ARGS :=

LOCAL_JACK_EXTRA_ARGS :=

LOCAL_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)

LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)

LOCAL_JACK_FLAGS:=

LOCAL_CERTIFICATE:=

LOCAL_SDK_VERSION:=

core/config.mk

+18 −5
Original line number Diff line number Diff line
@@ -405,17 +405,30 @@ MKTARBALL := build/tools/mktarball.sh 
TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)

E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)

JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar



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

JACK_VM := $(ANDROID_JACK_VM)

else

JACK_VM := java

endif

# call jack

#

# $(1): vm

# $(2): vm arguments

# $(3): jack perf arguments

# $(1): vm arguments

# $(2): jack perf arguments

define call-jack

$(1) $(2) -cp $(JACK_JAR) com.android.jack.Main $(3)

$(JACK_VM) $(1) -cp $(JACK_JAR) com.android.jack.Main $(2)

endef

DEFAULT_JACK_VM := java

$(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 -Xmx3584m -Xms2560m -XX:+TieredCompilation

endif

ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)

else

DEFAULT_JACK_EXTRA_ARGS := -D sched.runner=single-threaded --sanity-checks off

endif

JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main

PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -1752,7 +1752,7 @@ $(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then 
else \

    export tmpEcjArg=""; \

fi; \

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

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

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \
@@ -1785,7 +1785,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),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

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

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

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

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

    export tmpEcjArg=""; \

fi; \

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

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

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \