From 58570e7d5ef8ec486e6c91deee8d61b404dba25d Mon Sep 17 00:00:00 2001 From: Guilhem IMBERTON Date: Thu, 4 Oct 2012 14:26:57 +0200 Subject: Use consistent search depth. AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while vendorsetup.sh and BoardConfig.mk only allow for smaller depth. Make search depth consistent for these files. Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35 Signed-off-by: Beare, Bruce J Signed-off-by: Laurent Fert Signed-off-by: Guilhem Imberton Author: Laurent Fert --- envsetup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'envsetup.sh') diff --git a/envsetup.sh b/envsetup.sh index 70cb2de..998cf67 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1194,7 +1194,8 @@ if [ "x$SHELL" != "x/bin/bash" ]; then fi # Execute the contents of any vendorsetup.sh files we can find. -for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/*/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null` +for f in `test -d device && find device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` \ + `test -d vendor && find vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` do echo "including $f" . $f -- cgit v1.1