commit f44a518c104b706c752b671b0308716c7cca73d5
author Ying Wang <wangying@google.com> Tue Nov 27 14:17:27 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 27 14:17:27 2012 -0800
tree c2582a943f02ba307d43d02f39e5b7270b4eaa86
parent d4f8d5e64950eb114993a9de975e1519e3509d43
parent c69b773506ecf2316059a9fe947bbeb524a402b3

am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH

* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
  Put ANDROID_BUILD_PATHS before the system default PATH

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index c758fcc..b57a272 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -107,8 +107,8 @@
     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 @@
     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