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

Revert^2: "Setting Java 11 as the default version"

Browse Source 
Reverted Change: I2f9866deff41406aede24758f6eda5e5808c7f29

Reason for revert: Post-submission failure have been fixed.

Test: presubmit
Bug: 195387473
Change-Id: If5db1614ef455e2f1eae1d36cf514e13e7aab993
This commit is contained in:
Sorin Basca
2022-01-23 09:01:07 +00:00
parent b62248a6aa
commit 18ecf61090
5 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/sdk.go
View File

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