Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3aab9de authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964b 

Original change: https://android-review.googlesource.com/c/platform/build/+/3125236



Change-Id: I3591e94a4a92ec6a3f5b822ce44de20993d1614f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03468748 0aeb964b

core/java_common.mk

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION)) 
    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