commit 6528ea30869e28ca04c48664f2315611701faa94
author Yohann Roussel <yroussel@google.com> Mon Oct 12 18:02:51 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Oct 21 17:22:27 2015 +0200
tree d1ca2134636c0eda3808952b527659ca3e8eeb80
parent 8998d57404b73bf4df059542df4dc52631db45c9

Remove LOCAL_JACK_EXTRA_ARGS

Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.

(cherry picked from commit d2b2983cc791f90a0d052699603723335ab94f5a)

Change-Id: I1cd76836792e7332bc3750408a860400b0957485

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index e2b8516..6cf344f 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -109,7 +109,6 @@
 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

diff --git a/core/definitions.mk b/core/definitions.mk
index 872f7db..a036a25 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1779,9 +1779,8 @@
 
 # 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 @@
 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 @@
 	$(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 @@
 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

diff --git a/core/java_common.mk b/core/java_common.mk
index e3d2853..9d81096 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -259,7 +259,6 @@
         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),)