diff options
| author | Andy McFadden <fadden@android.com> | 2010-06-24 13:32:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-24 13:32:02 -0700 |
| commit | d3e1d0e96084667ba56a5f5aa3bc8f5e4c01e7e5 (patch) | |
| tree | a73246a765a40f3fb3edc72a3fbf4b6cb1992e2d /envsetup.sh | |
| parent | e63763087d6a251c8b427366330df3845610fd9d (diff) | |
| parent | 8969167db684ebdbfe72dd57aea7f7bdd5de8064 (diff) | |
| download | build-d3e1d0e96084667ba56a5f5aa3bc8f5e4c01e7e5.zip build-d3e1d0e96084667ba56a5f5aa3bc8f5e4c01e7e5.tar.gz build-d3e1d0e96084667ba56a5f5aa3bc8f5e4c01e7e5.tar.bz2 | |
am 8969167d: am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064'
* commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064':
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/envsetup.sh b/envsetup.sh index a582e3d..a229b49 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1068,17 +1068,15 @@ function godir () { # Force JAVA_HOME to point to java 1.6 if it isn't already set function set_java_home() { - 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.6/Home - ;; - *) - export JAVA_HOME=/usr/lib/jvm/java-6-sun - ;; - esac - fi + if [ ! "$JAVA_HOME" ]; 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 fi } |