commit 1e00ce0eaad3df28bb91bcd25515761471f266d0
author Tobias Thierer <tobiast@google.com> Thu Jul 27 10:43:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 10:43:13 2017 +0000
tree d45b899f81084557fd43cc45329eced9672cf404
parent 02e0f6c1dbe5f499f9797c08208c7276af7553e6
parent 67352ffa1f3620e1f760ff8ba25476d07e0dc41b

Merge "Build: Experimental option to default to -source 1.9 -target 1.9"
am: 67352ffa1f

Change-Id: If8ddf113caef943aad5e0b6ebaee01a6f3e41a4c

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 0859a46..4bdfdb1 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -19,7 +19,11 @@
   ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_18_support)))
     LOCAL_JAVA_LANGUAGE_VERSION := 1.7
   else
-    LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+    ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)
+      LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+    else
+      LOCAL_JAVA_LANGUAGE_VERSION := 1.9
+    endif
   endif
 endif
 LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)