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

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

Change-Id: I1ea8f34f94ab597fa9221c7d1ebd642aa2d20741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2023-03-01 07:43:28 +00:00
committed by Automerger Merge Worker
parent fe47748e38 8fcec519ff
commit a98b719472
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -727,10 +727,6 @@ func (c *config) IsEnvFalse(key string) bool {
return value == "0" || value == "n" || value == "no" || value == "off" || value == "false"
}
func (c *config) TargetsJava17() bool {
return c.IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_17")
}
// EnvDeps returns the environment variables this build depends on. The first
// call to this function blocks future reads from the environment.
func (c *config) EnvDeps() map[string]string {

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
}
}

10
java/sdk.go
View File

@@ -57,14 +57,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
return JAVA_VERSION_8
} else if sdk.FinalOrFutureInt() <= 31 {
return JAVA_VERSION_9
} 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 {
} else if sdk.FinalOrFutureInt() <= 32 {
return JAVA_VERSION_11
} else {
return JAVA_VERSION_17
}
}