am 0b584f2b: am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit '0b584f2b394051684e2506cc7304b583df29bca6':
  Include vendorsetup scripts in order
This commit is contained in:
Ying Wang 2015-04-04 21:40:06 +00:00 committed by Android Git Automerger
commit 55c838f115
1 changed files with 2 additions and 2 deletions

View File

@ -1492,8 +1492,8 @@ if [ "x$SHELL" != "x/bin/bash" ]; then
fi
# 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` \
`test -d vendor && find -L vendor -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 | sort`
do
echo "including $f"
. $f