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

Merge "Reland^2 "Target Java 17"" am: b0dc477ef7 am: 8fcec519ff am: a98b719472

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

Change-Id: Ia819bceff5218c94e94845f6db7846fa810b1883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2023-03-01 08:23:12 +00:00
committed by Automerger Merge Worker
parent dab6fce69c a98b719472
commit 790574484a
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -517,14 +517,8 @@ 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().TargetsJava17() {
// Temporary experimental flag to be able to try and build with
// java version 17 options. The flag, if used, just sets Java
// 17 as the default version, leaving any components that
// target an older version intact.
return JAVA_VERSION_17
} else {
return JAVA_VERSION_11
return JAVA_VERSION_17
}
}