commit f3a98c0b2b02d034318af7d4b05164fff8ad0bed
author The Android Open Source Project <initial-contribution@android.com> Mon Jul 12 14:50:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 12 14:50:28 2010 -0700
tree 55c6133f230f430fc7141685c232bc1e57875310
parent fee7fe7c74a031f769f53b9a7d6d0c0015130f3b
parent 93c63d5740cde483217fbbd2ee3c6b7223b3721f

am 93c63d57: merge from open-source master

Merge commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f'

* commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f':
  Vendorsetup needs to look in additional places.

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 346e35b..6b43edc 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1091,7 +1091,7 @@
 esac
 
 # Execute the contents of any vendorsetup.sh files we can find.
-for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
+for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/*/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
 do
     echo "including $f"
     . $f