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

Target Java 17

Browse Source 
Bug: 233029164
Test: TH
Change-Id: I750b866565c264eb4f4ac14ebc88be6fc9b1b458
This commit is contained in:
Sorin Basca
2022-10-07 15:24:12 +01:00
parent e0598a1cbd
commit d6be9e51ca
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

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

8
java/java.go
View File

@@ -510,14 +510,8 @@ 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().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 {
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 return JAVA_VERSION_8
} else if sdk.FinalOrFutureInt() <= 31 { } else if sdk.FinalOrFutureInt() <= 31 {
return JAVA_VERSION_9 return JAVA_VERSION_9
} else if ctx.Config().TargetsJava17() { } else if sdk.FinalOrFutureInt() <= 32 {
// 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_11
} else {
return JAVA_VERSION_17
} }
} }