StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LOCAL_JACK_EXTRA_ARGS

Browse Source 
Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.

(cherry picked from commit d2b2983cc7)

Change-Id: I1cd76836792e7332bc3750408a860400b0957485
This commit is contained in:
Yohann Roussel
2015-10-12 18:02:51 +02:00
parent 8998d57404
commit 6528ea3086
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@@ -109,7 +109,6 @@ LOCAL_ADDITIONAL_JAVA_DIR:=
LOCAL_ALLOW_UNDEFINED_SYMBOLS:= LOCAL_ALLOW_UNDEFINED_SYMBOLS:=
LOCAL_DX_FLAGS:= LOCAL_DX_FLAGS:=
LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental
LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)
LOCAL_JACK_FLAGS:= LOCAL_JACK_FLAGS:=
LOCAL_JILL_FLAGS:= LOCAL_JILL_FLAGS:=
LOCAL_CERTIFICATE:= LOCAL_CERTIFICATE:=

9
core/definitions.mk
View File

@@ -1779,9 +1779,8 @@ endef
# Call jack # Call jack
# #
# $(1): jack extra arguments
define call-jack define call-jack
JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(1) JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(DEFAULT_JACK_EXTRA_ARGS)
endef endef
# Common definition to invoke javac on the host and target. # 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 \ else \
export tmpEcjArg=""; \ export tmpEcjArg=""; \
fi; \ fi; \
$(call call-jack,$(PRIVATE_JACK_EXTRA_ARGS)) \ $(call call-jack) \
$(strip $(PRIVATE_JACK_FLAGS)) \ $(strip $(PRIVATE_JACK_FLAGS)) \
$(if $(NO_OPTIMIZE_DX), \ $(if $(NO_OPTIMIZE_DX), \
-D jack.dex.optimize="false") \ -D jack.dex.optimize="false") \
@@ -1919,7 +1918,7 @@ define transform-jar-to-jack
$(hide) mkdir -p $@.tmpjill.res $(hide) mkdir -p $@.tmpjill.res
$(hide) $(call unzip-jar-files,$<,$@.tmpjill.res) $(hide) $(call unzip-jar-files,$<,$@.tmpjill.res)
$(hide) find $@.tmpjill.res -iname "*.class" -delete $(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.resource.policy=keep-first \
-D jack.import.type.policy=keep-first \ -D jack.import.type.policy=keep-first \
--import $@.tmpjill.jack \ --import $@.tmpjill.jack \
@@ -1963,7 +1962,7 @@ $(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then
else \ else \
export tmpEcjArg=""; \ export tmpEcjArg=""; \
fi; \ fi; \
$(call call-jack,$(PRIVATE_JACK_EXTRA_ARGS)) \ $(call call-jack) \
$(strip $(PRIVATE_JACK_FLAGS)) \ $(strip $(PRIVATE_JACK_FLAGS)) \
$(if $(NO_OPTIMIZE_DX), \ $(if $(NO_OPTIMIZE_DX), \
-D jack.dex.optimize="false") \ -D jack.dex.optimize="false") \

1
core/java_common.mk
View File

@@ -259,7 +259,6 @@ full_static_jack_libs := \
JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),COMMON)/classes.jack) 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_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(LOCAL_JACK_EXTRA_ARGS)
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),) ifeq ($(LOCAL_SDK_VERSION),)