diff options
| author | Jeff Hamilton <jham@android.com> | 2010-06-08 14:07:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-08 14:07:47 -0700 |
| commit | a4db49fc576f717abe6da472cdf037ca209eaa20 (patch) | |
| tree | a0cd94e9e472170cd7d1be4c3407c25a044225af /envsetup.sh | |
| parent | 78eff9f5bd340eb1d105a1825ad936765dee7b14 (diff) | |
| parent | a207ba0dec2ea51c97042e4d6feaf3e3d87a2e59 (diff) | |
| download | build-a4db49fc576f717abe6da472cdf037ca209eaa20.zip build-a4db49fc576f717abe6da472cdf037ca209eaa20.tar.gz build-a4db49fc576f717abe6da472cdf037ca209eaa20.tar.bz2 | |
am a207ba0d: am 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5.
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/envsetup.sh b/envsetup.sh index 8798344..902b054 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1026,6 +1026,20 @@ function godir () { 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) _xarray=(a b c) if [ -z "${_xarray[${#_xarray[@]}]}" ] |