diff options
| author | 2024-10-16 10:25:36 +0100 | |
|---|---|---|
| committer | 2024-11-05 11:08:34 +0000 | |
| commit | 37cc2714c9150692f73153d5a92697d087acb4c6 (patch) | |
| tree | 3eb793a9540171ec49dd5f624359b8a1ef26afe0 /java/sdk.go | |
| parent | f69bffbc814584fe0d5bb0894669a0234fca2d38 (diff) | |
Target Java 21 by default
Bug: 342332820
Test: TH
Change-Id: I3d440c79231cc470013610c8b3ec95a0b4a0cb6a
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/sdk.go b/java/sdk.go index 4537f1913..036521c86 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -65,11 +65,11 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_9 } else if sdk.FinalOrFutureInt() <= 33 { return JAVA_VERSION_11 + } else if sdk.FinalOrFutureInt() <= 35 { + return JAVA_VERSION_17 } 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 |