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

Merge "Allow version 9 toolchains for EXPERIMENTAL_USE_OPENJDK9" am: 9847add454 am: d4174a1f76

Browse Source 
am: bb6076b1b1

Change-Id: Ib75d2169c5a4c11fe119c9f225f382835a08499c
This commit is contained in:
Tobias Thierer
2017-05-26 15:49:40 +00:00
committed by android-build-merger
parent 87399fe762 bb6076b1b1
commit e0e3fb86bc
1 changed files with 17 additions and 4 deletions
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 required_java_version string
var java_version_regexp *regexp.Regexp var java_version_regexp *regexp.Regexp
var javac_version_regexp *regexp.Regexp var javac_version_regexp *regexp.Regexp
required_java_version = "1.8"
java_version_regexp = regexp.MustCompile(`[ "]1\.8[\. "$]`) oj9_env, _ := config.Environment().Get("EXPERIMENTAL_USE_OPENJDK9")
javac_version_regexp = java_version_regexp 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 java_version := javaVersionInfo.java_version_output
javac_version := javaVersionInfo.javac_version_output javac_version := javaVersionInfo.javac_version_output
@@ -95,7 +105,10 @@ func checkJavaVersion(ctx Context, config Config) {
} }
if runtime.GOOS == "linux" { 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("*******************************************************")
ctx.Println("You are attempting to build with an unsupported JDK.") ctx.Println("You are attempting to build with an unsupported JDK.")
ctx.Println() ctx.Println()