Merge "Include vendorsetup scripts in order"

This commit is contained in:
Ying Wang
2015-04-04 21:03:32 +00:00
committed by Gerrit Code Review

View File

@@ -1487,8 +1487,8 @@ if [ "x$SHELL" != "x/bin/bash" ]; then
fi fi
# Execute the contents of any vendorsetup.sh files we can find. # Execute the contents of any vendorsetup.sh files we can find.
for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` \ for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \
`test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` `test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`
do do
echo "including $f" echo "including $f"
. $f . $f