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

2017-10-06 19:42:57 +00:00
parent dd68a6cb74 745c6a55d3
commit c6465f5d17
1 changed files with 6 additions and 1 deletions
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -22,7 +22,12 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
    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