commit b7d4e5248d34cad1451e7fb42dfc04359451bc04
author Yohann Roussel <yroussel@google.com> Mon Dec 21 13:03:19 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 21 13:03:19 2015 +0000
tree c0fdc894afb20ce4a25ccc9ce8c1f8b12ebb5957
parent 642dbdff66a2354235e9019e266430b0a8392c37
parent 0a24035cf689fecdc01fa5fb3bc068c1e8f42f8c

Merge "Do not set Jack source version, use default" am: 2983fd4b0f
am: 0a24035cf6

* commit '0a24035cf689fecdc01fa5fb3bc068c1e8f42f8c':
  Do not set Jack source version, use default

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 8eaac73..a6218cc 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1897,7 +1897,6 @@
     -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))) \
@@ -2038,7 +2037,6 @@
     $(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))) \