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

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

Merge "Use the RELEASE_TARGET_JAVA_21 flag for makefiles" into main am: 2527aad9 

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



Change-Id: I7939e945bbcf0fae4ceee8cab5aeb87fbf8810b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c1e3f5f 2527aad9

core/java_common.mk

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 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)

    else ifeq ($(RELEASE_TARGET_JAVA_21),true)

      LOCAL_JAVA_LANGUAGE_VERSION := 21

    else

      LOCAL_JAVA_LANGUAGE_VERSION := 17