diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-05-23 14:20:03 +0100 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-05-23 14:20:03 +0100 |
| commit | 8b4319c3aa59814aa3522c9a9e9e7178e7d78410 (patch) | |
| tree | a4a7454e1e7009bcd2dc2547152a12c44b3708a7 /ui | |
| parent | a9ec71f54f41c6261909525030a44d34a8cff479 (diff) | |
| download | build_soong-8b4319c3aa59814aa3522c9a9e9e7178e7d78410.tar.gz build_soong-8b4319c3aa59814aa3522c9a9e9e7178e7d78410.tar.bz2 build_soong-8b4319c3aa59814aa3522c9a9e9e7178e7d78410.zip | |
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
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/java.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ui/build/java.go b/ui/build/java.go index 5a09b1a2..481a6805 100644 --- a/ui/build/java.go +++ b/ui/build/java.go @@ -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 |