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

am 6e65ddb2: am cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."

Browse Source 
* commit '6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
  Lunch: don't use a toolchain that doesn't exist.
This commit is contained in:
Raphael Moll
2011-06-22 10:40:08 -07:00
committed by Android Git Automerger
parent d660540563 6e65ddb20a
commit 8508a07352
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
envsetup.sh
View File

@@ -95,18 +95,27 @@ function setpaths()
# #
##################################################################
# Note: on windows/cygwin, ANDROID_BUILD_PATHS will contain spaces
# due to "C:\Program Files" being in the path.
# out with the old
if [ -n $ANDROID_BUILD_PATHS ] ; then
if [ -n "$ANDROID_BUILD_PATHS" ] ; then
export PATH=${PATH/$ANDROID_BUILD_PATHS/}
fi
if [ -n $ANDROID_PRE_BUILD_PATHS ] ; then
if [ -n "$ANDROID_PRE_BUILD_PATHS" ] ; then
export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/}
fi
# and in with the new
CODE_REVIEWS=
prebuiltdir=$(getprebuilt)
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.3/bin
toolchaindir=toolchain/arm-eabi-4.4.3/bin
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
if [ -d "$prebuiltdir/$toolchaindir" ]; then
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
else
export ANDROID_EABI_TOOLCHAIN=
fi
export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS