am 93c63d57: merge from open-source master

Merge commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f'

* commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f':
  Vendorsetup needs to look in additional places.
This commit is contained in:
The Android Open Source Project 2010-07-12 14:50:28 -07:00 committed by Android Git Automerger
commit f3a98c0b2b

View file

@ -1091,7 +1091,7 @@ case `ps -o command -p $$` in
esac
# Execute the contents of any vendorsetup.sh files we can find.
for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/*/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
do
echo "including $f"
. $f