commit fcf7c81a7fdd0a427965f147742f4eabe45aab1c
author Neil Fuller <nfuller@google.com> Mon Jan 25 17:35:57 2016 +0000
committer Neil Fuller <nfuller@google.com> Mon Jan 25 17:35:57 2016 +0000
tree 22096fba485b6650e52a6d03b1b5f7915cdfb115
parent 4f90999d7a5cab6d4e6065c111351f08feaa0ccf

Revert "Revert "Make OpenJDK 8 the default""

Reapply the JDK 8 switch in internal builds.

This reverts commit 85bddfdedffb425d85657314591a57191113806b.

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index f266f1a..61b9ff0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1426,7 +1426,8 @@
     fi
 
     if [ ! "$JAVA_HOME" ]; then
-      if [ ! "$EXPERIMENTAL_USE_JAVA8" ]; then
+      if [ -n "$LEGACY_USE_JAVA7" ]; then
+        echo Warning: Support for JDK 7 will be dropped. Switch to JDK 8.
         case `uname -s` in
             Darwin)
                 export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)