commit 4495f6afb8c23950c24dc9ee114050582da08f05
author Neil Fuller <nfuller@google.com> Wed Dec 16 18:59:08 2015 +0000
committer Neil Fuller <nfuller@google.com> Mon Jan 25 10:19:25 2016 +0000
tree f92f0f5f671363376288237081ea2fce1d7ae740
parent adad19674cfd7c38b16f2c2bd0c5bdf956157c6c

Make OpenJDK 8 the default

To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true

And run envsetup.sh/lunch again.

Bug: 25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770

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)