commit 58570e7d5ef8ec486e6c91deee8d61b404dba25d
author Guilhem IMBERTON <guilhem.imberton@intel.com> Thu Oct 04 14:26:57 2012 +0200
committer Guilhem IMBERTON <guilhem.imberton@intel.com> Tue Jul 23 21:02:15 2013 +0200
tree 74b9377b2fd7076fce9e63d1c085e50643014a74
parent a1f8cdf74bcc35110bd306d633e019a6279fc7fe

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 <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e008a64..a2aa3da 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -143,8 +143,8 @@
 board_config_mk := \
 	$(strip $(wildcard \
 		$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \
-		device/*/$(TARGET_DEVICE)/BoardConfig.mk \
-		vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \
+		$(shell test -d device && find device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \
+		$(shell test -d vendor && find vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \
 	))
 ifeq ($(board_config_mk),)
   $(error No config file found for TARGET_DEVICE $(TARGET_DEVICE))

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 70cb2de..998cf67 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1194,7 +1194,8 @@
 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