commit 9945bac30311cc5f7732a9c285dec32d497c47ca
author Android (Google) Code Review <android-gerrit@google.com> Fri Jul 03 08:58:53 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Jul 03 08:58:53 2009 -0700
tree 11aafdf2d31e42e59ae7e182ab2da751a539bd44
parent 45ae88c2a2899154cb27794f9843de82307b228b
parent bd1ee348a1891836cf3b5d0da72e75c0d256fa43

am bd1ee348: Merge change 6059 into donut

Merge commit 'bd1ee348a1891836cf3b5d0da72e75c0d256fa43'

* commit 'bd1ee348a1891836cf3b5d0da72e75c0d256fa43':
  Also look in vendor/*/build for vendorsetup.sh

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index e39a610..d797b7c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1010,7 +1010,7 @@
 unset _xarray
 
 # Execute the contents of any vendorsetup.sh files we can find.
-for f in `/bin/ls vendor/*/vendorsetup.sh 2> /dev/null`
+for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh 2> /dev/null`
 do
     echo "including $f"
     . $f