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

Merge "Do not set Jack source version, use default"

Browse Source
This commit is contained in:
Yohann Roussel
2015-12-21 12:57:29 +00:00
committed by Gerrit Code Review
parent e2476f82a1 09ee66e2b4
commit 2983fd4b0f
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -1896,7 +1896,6 @@ $(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 \
--output-jack $(PRIVATE_CLASSES_JACK) \ --output-jack $(PRIVATE_CLASSES_JACK) \
-D jack.java.source.version=1.7 \
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \ $(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \
--output-dex $(PRIVATE_JACK_INTERMEDIATES_DIR) \ --output-dex $(PRIVATE_JACK_INTERMEDIATES_DIR) \
$(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \ $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \
@@ -2037,7 +2036,6 @@ $(call call-jack) \
$(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \ $(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \
-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 \
-D jack.java.source.version=1.7 \
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \ $(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \
--output-jack $@ \ --output-jack $@ \
$(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \ $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \