Merge "Revert "Reland "Target Java 17""" am: 4d3f11ccb3
am: 212860594e
am: 29b58a6dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435953 Change-Id: Ic589a5de90db628f9f5a35d12518dcc19df1694c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -517,8 +517,14 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an
|
||||
return normalizeJavaVersion(ctx, javaVersion)
|
||||
} else if ctx.Device() {
|
||||
return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx))
|
||||
} else {
|
||||
} 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
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user