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

Commit 2983fd4b authored by Yohann Roussel's avatar Yohann Roussel Committed by Gerrit Code Review
Browse files

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

parents e2476f82 09ee66e2

core/definitions.mk

+0 −2
Original line number Diff line number Diff line
@@ -1896,7 +1896,6 @@ $(call call-jack) \ 
    -D jack.import.resource.policy=keep-first \

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

    --output-jack $(PRIVATE_CLASSES_JACK) \

    -D jack.java.source.version=1.7 \

    $(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \

    --output-dex $(PRIVATE_JACK_INTERMEDIATES_DIR) \

    $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \
@@ -2037,7 +2036,6 @@ $(call call-jack) \ 
    $(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \

    -D jack.import.resource.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)) \

    --output-jack $@ \

    $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \