Merge change 6059 into donut

* changes: Also look in vendor/*/build for vendorsetup.sh
2009-07-02 05:43:46 -07:00
parent 92c8ecbf99 a8c14e8c33
commit bd1ee348a1
1 changed files with 1 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1009,7 +1009,7 @@ fi
 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