commit 46e00ea4ba3cddfd9792b501d30d95d93828dd66
author Neil Fuller <nfuller@google.com> Thu Oct 16 10:23:03 2014 +0100
committer Neil Fuller <nfuller@google.com> Wed Oct 22 10:53:59 2014 +0100
tree e3d907fdf67c4a123440c49f96ad131c5e5793b9
parent c131ec09d9ffb92473c4162c92c0646d6e731b0c

Remove Java 6 build support

Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index c29b788..18bc972 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1390,7 +1390,7 @@
     \cd $T/$pathname
 }
 
-# Force JAVA_HOME to point to java 1.7 or java 1.6  if it isn't already set.
+# Force JAVA_HOME to point to java 1.7 if it isn't already set.
 #
 # Note that the MacOS path for java 1.7 includes a minor revision number (sigh).
 # For some reason, installing the JDK doesn't make it show up in the
@@ -1407,25 +1407,14 @@
     fi
 
     if [ ! "$JAVA_HOME" ]; then
-      if [ -n "$LEGACY_USE_JAVA6" ]; then
-        case `uname -s` in
-            Darwin)
-                export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
-                ;;
-            *)
-                export JAVA_HOME=/usr/lib/jvm/java-6-sun
-                ;;
-        esac
-      else
-        case `uname -s` in
-            Darwin)
-                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
-                ;;
-            *)
-                export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
-                ;;
-        esac
-      fi
+      case `uname -s` in
+          Darwin)
+              export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
+              ;;
+          *)
+              export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+              ;;
+      esac
 
       # Keep track of the fact that we set JAVA_HOME ourselves, so that
       # we can change it on the next envsetup.sh, if required.