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

am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH

Browse Source 
* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
  Put ANDROID_BUILD_PATHS before the system default PATH
This commit is contained in:
Ying Wang
2012-11-27 14:17:27 -08:00
committed by Android Git Automerger
parent d4f8d5e649 c69b773506
commit f44a518c10
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
envsetup.sh
View File

@@ -107,8 +107,8 @@ function setpaths()
fi fi
if [ -n "$ANDROID_PRE_BUILD_PATHS" ] ; then if [ -n "$ANDROID_PRE_BUILD_PATHS" ] ; then
export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/} export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/}
# strip trailing ':', if any # strip leading ':', if any
export PATH=${PATH/%:/} export PATH=${PATH/:%/}
fi fi
# and in with the new # and in with the new
@@ -154,8 +154,8 @@ function setpaths()
export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_DEV_SCRIPTS=$T/development/scripts export ANDROID_DEV_SCRIPTS=$T/development/scripts
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN$ARM_EABI_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN$ARM_EABI_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS:
export PATH=$PATH$ANDROID_BUILD_PATHS export PATH=$ANDROID_BUILD_PATHS$PATH
unset ANDROID_JAVA_TOOLCHAIN unset ANDROID_JAVA_TOOLCHAIN
unset ANDROID_PRE_BUILD_PATHS unset ANDROID_PRE_BUILD_PATHS