commit 8969167db684ebdbfe72dd57aea7f7bdd5de8064
author Andy McFadden <fadden@android.com> Thu Jun 24 13:29:15 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 24 13:29:15 2010 -0700
tree 88e7688492bec5540dc9677fe53a80046e84c0ca
parent 6f2bb44b4b3551738c429a25f99e42aca8913f4f
parent bd960940e1299d69a6cdf4176cfd1f53a5dba83a

am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Merge commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a' into gingerbread-plus-aosp

* commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index ef731c1..b2415e0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1068,17 +1068,15 @@
 
 # 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
 }