am 04be0d86: Set JAVA_HOME to point to java 1.5.

Merge commit '04be0d869acce82293b6c668f52bddf14c106908' into froyo-plus-aosp

* commit '04be0d869acce82293b6c668f52bddf14c106908':
  Set JAVA_HOME to point to java 1.5.
This commit is contained in:
Jeff Hamilton 2010-06-08 14:05:12 -07:00 committed by Android Git Automerger
commit d35e7f5aab

View file

@ -1026,6 +1026,20 @@ function godir () {
cd $T/$pathname cd $T/$pathname
} }
# Force JAVA_HOME to point to java 1.5 if it isn't already set
if [ "$STAY_OFF_MY_LAWN" = "" ]; then
if [ ! "$JAVA_HOME" ]; then
case `uname -s` in
Darwin)
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
;;
*)
export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
;;
esac
fi
fi
# determine whether arrays are zero-based (bash) or one-based (zsh) # determine whether arrays are zero-based (bash) or one-based (zsh)
_xarray=(a b c) _xarray=(a b c)
if [ -z "${_xarray[${#_xarray[@]}]}" ] if [ -z "${_xarray[${#_xarray[@]}]}" ]