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
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") \