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

Commit 6528ea30 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Remove LOCAL_JACK_EXTRA_ARGS 

Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.

(cherry picked from commit d2b2983c)

Change-Id: I1cd76836792e7332bc3750408a860400b0957485
parent 8998d574

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +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_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)

LOCAL_JACK_FLAGS:=

LOCAL_JILL_FLAGS:=

LOCAL_CERTIFICATE:=

core/definitions.mk

+4 −5
Original line number Diff line number Diff line
@@ -1779,9 +1779,8 @@ endef 


# Call jack

#

# $(1): jack extra arguments

define call-jack

 JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(1)

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

endef



# Common definition to invoke javac on the host and target.
@@ -1884,7 +1883,7 @@ $(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then 
else \

    export tmpEcjArg=""; \

fi; \

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

$(call call-jack) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \
@@ -1919,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_EXTRA_ARGS)) \

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

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

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

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

    export tmpEcjArg=""; \

fi; \

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

$(call call-jack) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

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

core/java_common.mk

+0 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ full_static_jack_libs := \ 
        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),COMMON)/classes.jack)



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

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



ifndef LOCAL_IS_HOST_MODULE

ifeq ($(LOCAL_SDK_VERSION),)