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

Merge "Adding experimental option to target Java 11" am: eb59a6d3ea

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

Change-Id: I0f2cf1d6dbfe020e906260978c9395b669f94032
This commit is contained in:
Sorin Basca
2021-12-10 14:21:25 +00:00
committed by Automerger Merge Worker
parent 8bc61f24aa eb59a6d3ea
commit 2aabb8de52
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -434,6 +434,12 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext an
return normalizeJavaVersion(ctx, javaVersion) return normalizeJavaVersion(ctx, javaVersion)
} else if ctx.Device() { } else if ctx.Device() {
return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx)) return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx))
} else if ctx.Config().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") {
// Temporary experimental flag to be able to try and build with
// java version 11 options. The flag, if used, just sets Java
// 11 as the default version, leaving any components that
// target an older version intact.
return JAVA_VERSION_11
} else { } else {
return JAVA_VERSION_9 return JAVA_VERSION_9
} }

6
java/sdk.go
View File

@@ -55,6 +55,12 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
return JAVA_VERSION_7 return JAVA_VERSION_7
} else if sdk.FinalOrFutureInt() <= 29 { } else if sdk.FinalOrFutureInt() <= 29 {
return JAVA_VERSION_8 return JAVA_VERSION_8
} else if ctx.Config().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") {
// Temporary experimental flag to be able to try and build with
// java version 11 options. The flag, if used, just sets Java
// 11 as the default version, leaving any components that
// target an older version intact.
return JAVA_VERSION_11
} else { } else {
return JAVA_VERSION_9 return JAVA_VERSION_9
} }