commit 4c6a1ee5fc1e06992e67c4a3600e60dce0597226
author Neil Fuller <nfuller@google.com> Mon Feb 15 12:51:39 2016 +0000
committer Neil Fuller <nfuller@google.com> Thu Feb 18 14:18:04 2016 +0000
tree 57491669c41ca74e2e6f46b15be5c4412da50f8c
parent 668d34693582137a25bfd33544c49afa4b26b06b

Add flags needed to switch Jack to 1.8 for CTS targets

When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

core-tests-hostdex does not appear to be used in this
branch but it is used in downstream branches.

Bug: 27113322
Bug: 26953739
(cherry-picked from commit 6917cb59b4776bfd190e3ea26fd75156c6d9bd1e)

Change-Id: Id70a78aad45d15bdd23537df438fbfcd126f38d3

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index c9989d3..e95d49b 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -290,6 +290,7 @@
     LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_MODULE_TAGS := optional
+    LOCAL_JAVA_LANGUAGE_VERSION := 1.8
     LOCAL_MODULE := core-tests-hostdex
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
     include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)