tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Drop build support for LEGACY_USE_JAVA7."

Browse source 
am: 442b7e6dc9

Change-Id: I479a556358416448d4cb670e4db0a7ffd9122d3b
This commit is contained in:
Tobias Thierer 2017-05-24 10:28:06 +00:00 committed by android-build-merger
commit ce18bd5a63
1 changed files with 3 additions and 9 deletions
Show stats 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 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
if legacy, _ := config.Environment().Get("LEGACY_USE_JAVA7"); legacy != "" { required_java_version = "1.8"
required_java_version = "1.7" java_version_regexp = regexp.MustCompile(`[ "]1\.8[\. "$]`)
java_version_regexp = regexp.MustCompile(`^java .*[ "]1\.7[\. "$]`) javac_version_regexp = java_version_regexp
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
}
java_version := javaVersionInfo.java_version_output java_version := javaVersionInfo.java_version_output
javac_version := javaVersionInfo.javac_version_output javac_version := javaVersionInfo.javac_version_output