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

Merge "Allow experimental Java target 21 by default" into main am: bc44eb03db am: 1e6f57b6dc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099283

Change-Id: Icbd72acac5b729b16b71c3fac4d55ca29232163a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-23 17:51:23 +00:00
committed by Automerger Merge Worker
parent a6efbada57 1e6f57b6dc
commit cc2b4f482e
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -567,6 +567,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
}

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
}