commit 1bd16b67c4b05f9df1f6d9ef85365929df0c34ef
author Neil Fuller <nfuller@google.com> Thu Nov 19 15:19:07 2015 +0000
committer Neil Fuller <nfuller@google.com> Mon Jan 11 11:25:26 2016 +0000
tree bf204f0adb671a1b2fe32742d78dc87472e777a2
parent 86d7ffb6c66a384e94aa44f93d6d88ca76923770

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: Iba08a9d3cf73bae7124e431dfe87c20ac219591e

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index cb3dc10..61b9ff0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1426,10 +1426,8 @@
     fi
 
     if [ ! "$JAVA_HOME" ]; then
-      if [ ! "$EXPERIMENTAL_USE_JAVA8" ]; then
-        echo JDK 8 will soon become the default. Please install it now.
-        echo Also: \"export EXPERIMENTAL_USE_JAVA8=true\"
-        echo See http://go/android-jdk8-discuss
+      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)