commit aa97ed53691047799f17523ce38863640b2d21c9
author Doug Zongker <dougz@android.com> Thu Jul 07 11:24:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 07 11:24:41 2011 -0700
tree d1715d96c14ee25bf7859264c4ee2b2ef5ef724b
parent 4227d02e6fa7399c8efd7c8d737b7a53d8076a28
parent 752ad06eeccdd1bc932d7d29276fbdaf736b7bba

Merge "Prevent "::" in PATH on multiple lunch"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index a845a18..a9417b8 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -131,12 +131,11 @@
     export PATH=$PATH$ANDROID_BUILD_PATHS
 
     unset ANDROID_JAVA_TOOLCHAIN
+    unset ANDROID_PRE_BUILD_PATHS
     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
+        export ANDROID_PRE_BUILD_PATHS=$ANDROID_JAVA_TOOLCHAIN:
+        export PATH=$ANDROID_PRE_BUILD_PATHS$PATH
     fi
 
     unset ANDROID_PRODUCT_OUT