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

Commit 0aeb964b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 95661308 73ba7970
Loading
Loading
Loading
Loading
+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