openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Allow version 9 toolchains for EXPERIMENTAL_USE_OPENJDK9"

This commit is contained in:
Tobias Thierer 2017-05-26 12:08:36 +00:00 committed by Gerrit Code Review
parent 99f64d439c 849bb6bf99
commit 9847add454
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/build/java.go
View File

@ -66,9 +66,19 @@ func checkJavaVersion(ctx Context, config Config) {
var required_java_version string
var java_version_regexp *regexp.Regexp
var javac_version_regexp *regexp.Regexp
required_java_version = "1.8"
java_version_regexp = regexp.MustCompile(`[ "]1\.8[\. "$]`)
javac_version_regexp = java_version_regexp
oj9_env, _ := config.Environment().Get("EXPERIMENTAL_USE_OPENJDK9")
experimental_use_openjdk9 := oj9_env != ""
if experimental_use_openjdk9 {
required_java_version = "9"
java_version_regexp = regexp.MustCompile(`^java .* "9.*"`)
javac_version_regexp = regexp.MustCompile(`^javac 9`)
} else {
required_java_version = "1.8"
java_version_regexp = regexp.MustCompile(`[ "]1\.8[\. "$]`)
javac_version_regexp = java_version_regexp
}
java_version := javaVersionInfo.java_version_output
javac_version := javaVersionInfo.javac_version_output
@ -95,7 +105,10 @@ func checkJavaVersion(ctx Context, config Config) {
}
if runtime.GOOS == "linux" {
if !strings.Contains(java_version, "openjdk") {
// Early access builds of OpenJDK 9 do not contain the string "openjdk" in the
// version name. TODO(tobiast): Reconsider once the OpenJDK 9 toolchain is stable.
// http://b/62123342
if !strings.Contains(java_version, "openjdk") && !experimental_use_openjdk9 {
ctx.Println("*******************************************************")
ctx.Println("You are attempting to build with an unsupported JDK.")
ctx.Println()