StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec1c20a7: am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Browse Source 
Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'

* commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d':
  Switch the required host Java environment to 1.6.
This commit is contained in:
Sriram Raman
2010-06-11 12:34:09 -07:00
committed by Android Git Automerger
parent ad8cbaa718 ec1c20a707
commit 19b9aa3cd1
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
envsetup.sh
View File

@@ -98,6 +98,9 @@ function setpaths()
if [ -n $ANDROID_BUILD_PATHS ] ; then
export PATH=${PATH/$ANDROID_BUILD_PATHS/}
fi
if [ -n $ANDROID_PRE_BUILD_PATHS ] ; then
export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/}
fi
# and in with the new
CODE_REVIEWS=
@@ -108,6 +111,15 @@ function setpaths()
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS
export PATH=$PATH$ANDROID_BUILD_PATHS
unset ANDROID_JAVA_TOOLCHAIN
if [ -n "$JAVA_HOME" ]; then
export ANDROID_JAVA_TOOLCHAIN=$JAVA_HOME/bin
fi
export ANDROID_PRE_BUILD_PATHS=$ANDROID_JAVA_TOOLCHAIN
if [ -n "$ANDROID_PRE_BUILD_PATHS" ]; then
export PATH=$ANDROID_PRE_BUILD_PATHS:$PATH
fi
unset ANDROID_PRODUCT_OUT
export ANDROID_PRODUCT_OUT=$(get_abs_build_var PRODUCT_OUT)
export OUT=$ANDROID_PRODUCT_OUT
@@ -133,6 +145,7 @@ function printconfig()
function set_stuff_for_environment()
{
settitle
set_java_home
setpaths
set_sequence_number
@@ -1026,19 +1039,21 @@ 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
# 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
fi
fi
}
# determine whether arrays are zero-based (bash) or one-based (zsh)
_xarray=(a b c)