commit c6465f5d1724ec568f9ccee4962e5192e69382d1
author Tobias Thierer <tobiast@google.com> Fri Oct 06 19:42:57 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 06 19:42:57 2017 +0000
tree 24730546abfeed723ae05d1dd33efd0281a63b4a
parent dd68a6cb741dfb89808ffe1970e9797741d5b7c9
parent 745c6a55d34bdcb01592d3422f7f41edb6bf170b

Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26."

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 837983b..320c52f 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -22,7 +22,12 @@
     ifneq ($(EXPERIMENTAL_USE_OPENJDK9),true)
       LOCAL_JAVA_LANGUAGE_VERSION := 1.8
     else
-      LOCAL_JAVA_LANGUAGE_VERSION := 1.9
+      private_sdk_versions_without_any_java_19_support := 24 25 26
+      ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_19_support)))
+        LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+      else
+        LOCAL_JAVA_LANGUAGE_VERSION := 1.9
+      endif
     endif
   endif
 endif