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

Merge "Drop build support for LEGACY_USE_JAVA7."

Browse Source
This commit is contained in:
Tobias Thierer
2017-05-24 10:24:51 +00:00
committed by Gerrit Code Review
parent ad086267e3 8b4319c3aa
commit 442b7e6dc9
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/build/java.go
View File

@@ -66,15 +66,9 @@ func checkJavaVersion(ctx Context, config Config) {
var required_java_version string
var java_version_regexp *regexp.Regexp
var javac_version_regexp *regexp.Regexp
if legacy, _ := config.Environment().Get("LEGACY_USE_JAVA7"); legacy != "" {
required_java_version = "1.7"
java_version_regexp = regexp.MustCompile(`^java .*[ "]1\.7[\. "$]`)
javac_version_regexp = regexp.MustCompile(`[ "]1\.7[\. "$]`)
} else {
required_java_version = "1.8"
java_version_regexp = regexp.MustCompile(`[ "]1\.8[\. "$]`)
javac_version_regexp = java_version_regexp
}
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