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

Setting Java 11 as the default version

Browse Source 
Test: m
Change-Id: Ia9a0aa2a4aa02d7b67ad8e1cb6083d33c3d75e70
This commit is contained in:
Sorin Basca
2022-01-12 16:04:50 +00:00
parent 07d858468e
commit 171c2103b8
5 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -450,14 +450,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().TargetsJava11() {
// 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 {
return JAVA_VERSION_9
return JAVA_VERSION_11
}
}