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

Drop build support for LEGACY_USE_JAVA7. 

This flag allowed for building with an OpenJDK 7 toolchain. It was
used for build bot builds that now work with an OpenJDK 8 toolchain.
Hence, this feature is no longer required. This CL drops it.

Bug: 27583810
Test: Treehugger build succeeds.
Change-Id: Iba9cf12cff2597fa70aa9999e8a6bda190f29f3c
This commit is contained in:
Tobias Thierer 2017-05-23 14:20:03 +01:00
parent a9ec71f54f
commit 8b4319c3aa
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 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