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

* commit 'f994458babc78670263085b027bfaa34ff0bc52a':
  Include vendorsetup scripts in order
This commit is contained in:
Ying Wang 2015-04-04 21:20:52 +00:00 committed by Android Git Automerger
commit 0b584f2b39
1 changed files with 2 additions and 2 deletions

View File

@ -1487,8 +1487,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