commit 0aeb964be812742f665c990016f17955de131bfa
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 13 19:15:50 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 13 19:15:50 2024 +0000
tree 2d8dcfda5a372e9dc2000e9cb299b99a7b4038e3
parent 95661308526c46131d765845acd9cbe0adfb2b21
parent 73ba79702ef72167e683998c2a9dc2ea0934833c

Merge "Allow experimental use of Java 21 by default in makefiles" into main

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 65feb15..a21f062 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -32,6 +32,8 @@
     else ifneq (,$(LOCAL_SDK_VERSION)$(TARGET_BUILD_USE_PREBUILT_SDKS))
       # TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules
       LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+    else ifeq ($(EXPERIMENTAL_TARGET_JAVA_VERSION_21),true)
+      LOCAL_JAVA_LANGUAGE_VERSION := 21
     else
       LOCAL_JAVA_LANGUAGE_VERSION := 17
     endif