diff --git a/envsetup.sh b/envsetup.sh
index 541bb1142..984167e45 100644
--- 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