From c69b773506ecf2316059a9fe947bbeb524a402b3 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 26 Nov 2012 20:51:59 -0800 Subject: [PATCH] Put ANDROID_BUILD_PATHS before the system default PATH So tools like adb that are built from source won't be overridden by the host system tools, when you run these tools without specifying the path. Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d --- envsetup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index c758fccb5..b57a2729f 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -107,8 +107,8 @@ function setpaths() fi if [ -n "$ANDROID_PRE_BUILD_PATHS" ] ; then export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/} - # strip trailing ':', if any - export PATH=${PATH/%:/} + # strip leading ':', if any + export PATH=${PATH/:%/} fi # and in with the new @@ -154,8 +154,8 @@ function setpaths() export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN export ANDROID_QTOOLS=$T/development/emulator/qtools 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 PATH=$PATH$ANDROID_BUILD_PATHS + 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=$ANDROID_BUILD_PATHS$PATH unset ANDROID_JAVA_TOOLCHAIN unset ANDROID_PRE_BUILD_PATHS