am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."

* commit 'f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
  Allow symlinks to device or vendor tree in envsetup.sh.
This commit is contained in:
Ying Wang
2014-07-10 00:16:48 +00:00
committed by Android Git Automerger

View File

@@ -1465,8 +1465,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 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` \
`test -d vendor && find vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` `test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null`
do do
echo "including $f" echo "including $f"
. $f . $f