p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Andy McFadden 2010-06-24 13:32:02 -07:00 committed by Android Git Automerger
parent e63763087d 8969167db6
commit d3e1d0e960
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
envsetup.sh
View File

@ -1068,17 +1068,15 @@ function godir () {
# Force JAVA_HOME to point to java 1.6 if it isn't already set # Force JAVA_HOME to point to java 1.6 if it isn't already set
function set_java_home() { function set_java_home() {
if [ "$STAY_OFF_MY_LAWN" = "" ]; then if [ ! "$JAVA_HOME" ]; then
if [ ! "$JAVA_HOME" ]; then case `uname -s` in
case `uname -s` in Darwin)
Darwin) export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home ;;
;; *)
*) export JAVA_HOME=/usr/lib/jvm/java-6-sun
export JAVA_HOME=/usr/lib/jvm/java-6-sun ;;
;; esac
esac
fi
fi fi
} }