commit 442b7e6dc9d05c0c904c0023753ac6d5e876b507
author Tobias Thierer <tobiast@google.com> Wed May 24 10:24:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 10:24:53 2017 +0000
tree 0d1e43ca1f2e7a3f092068f56d90b6f6a7c945f4
parent ad086267e3af5f9d9bacbfae73b341241779bfc3
parent 8b4319c3aa59814aa3522c9a9e9e7178e7d78410

Merge "Drop build support for LEGACY_USE_JAVA7."

ui/build/java.go

diff --git a/ui/build/java.go b/ui/build/java.go
index 5a09b1a..481a680 100644
--- a/ui/build/java.go
+++ b/ui/build/java.go
@@ -66,15 +66,9 @@
 	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