openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Use sensible default locations for Java"

This commit is contained in:
Neil Fuller 2015-11-20 10:16:17 +00:00 committed by Gerrit Code Review
parent 4ed5735a68 91e012cd99
commit 8f354bc8c2
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
envsetup.sh
View File

@ -1413,11 +1413,7 @@ function godir () {
\cd $T/$pathname \cd $T/$pathname
} }
# Force JAVA_HOME to point to java 1.7 if it isn't already set. # Force JAVA_HOME to point to java 1.7/1.8 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
# JavaVM.framework/Versions/1.7/ folder.
function set_java_home() { function set_java_home() {
# Clear the existing JAVA_HOME value if we set it ourselves, so that # Clear the existing JAVA_HOME value if we set it ourselves, so that
# we can reset it later, depending on the version of java the build # we can reset it later, depending on the version of java the build
@ -1430,6 +1426,7 @@ function set_java_home() {
fi fi
if [ ! "$JAVA_HOME" ]; then if [ ! "$JAVA_HOME" ]; then
if [ ! "$EXPERIMENTAL_USE_JAVA8" ]; then
case `uname -s` in case `uname -s` in
Darwin) Darwin)
export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
@ -1438,6 +1435,16 @@ function set_java_home() {
export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
;; ;;
esac esac
else
case `uname -s` in
Darwin)
export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
;;
*)
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
;;
esac
fi
# Keep track of the fact that we set JAVA_HOME ourselves, so that # Keep track of the fact that we set JAVA_HOME ourselves, so that
# we can change it on the next envsetup.sh, if required. # we can change it on the next envsetup.sh, if required.