From 37cc2714c9150692f73153d5a92697d087acb4c6 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Wed, 16 Oct 2024 10:25:36 +0100 Subject: Target Java 21 by default Bug: 342332820 Test: TH Change-Id: I3d440c79231cc470013610c8b3ec95a0b4a0cb6a --- java/java.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 53b3481d0..e95bd1bc2 100644 --- a/java/java.go +++ b/java/java.go @@ -606,10 +606,8 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an } 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. + // Build flag that controls whether Java 21 is used as the default + // target version, or Java 17. return JAVA_VERSION_21 } else { return JAVA_VERSION_17 -- cgit v1.2.3-59-g8ed1b