From 253f8c045a6650e45f3c50ca8882bbd73890bb13 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 23 May 2024 10:28:24 +0100 Subject: Allow experimental Java target 21 by default Bug: 342332820 Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m Change-Id: I6cc21bf191385df91c2446b7cd6291a0e3532bea --- java/java.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index fc7e5c5a3..3c16cc713 100644 --- a/java/java.go +++ b/java/java.go @@ -577,6 +577,12 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an return normalizeJavaVersion(ctx, javaVersion) } else if ctx.Device() { return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx)) + } else if ctx.Config().TargetsJava21() { + // Temporary experimental flag to be able to try and build with + // java version 21 options. The flag, if used, just sets Java + // 21 as the default version, leaving any components that + // target an older version intact. + return JAVA_VERSION_21 } else { return JAVA_VERSION_17 } -- cgit v1.2.3-59-g8ed1b