Source vendorsetup.sh from the device tree.
This way, individual open-source device configurations can
publish device-specific configurations without having
to maintain those centrally in envsetup.sh
Bug: 2533998
Change-Id: I1377846d4d3ebe7abcd2f8279a08abe54039cdbb
diff --git a/envsetup.sh b/envsetup.sh
index 1c114d0..85465b1 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1037,7 +1037,7 @@
unset _xarray
# Execute the contents of any vendorsetup.sh files we can find.
-for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh 2> /dev/null`
+for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
do
echo "including $f"
. $f