Revert "Revert "Make OpenJDK 8 the default""

Reapply the switch to JDK 8 on aosp/master.

This reverts commit 85bddfdedf.

Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
This commit is contained in:
Neil Fuller
2016-01-25 17:12:41 +00:00
parent 85bddfdedf
commit 1f495b865e
3 changed files with 10 additions and 9 deletions

View File

@@ -1426,7 +1426,8 @@ function set_java_home() {
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)