Remove Java 6 build support

Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
This commit is contained in:
Neil Fuller
2014-10-16 10:23:03 +01:00
parent c131ec09d9
commit 46e00ea4ba
4 changed files with 10 additions and 46 deletions

View File

@@ -1390,7 +1390,7 @@ function godir () {
\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 @@ function set_java_home() {
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.