StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow experimental Java target 21 by default

Browse Source 
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m
Change-Id: I6cc21bf191385df91c2446b7cd6291a0e3532bea
This commit is contained in:
Sorin Basca
2024-05-23 10:28:24 +01:00
parent 635e1218bd
commit 253f8c045a
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/sdk.go
View File

@@ -65,6 +65,12 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
return JAVA_VERSION_9
} else if sdk.FinalOrFutureInt() <= 33 {
return JAVA_VERSION_11
} 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
}