diff options
| author | Ying Wang <wangying@android.com> | 2013-07-25 01:54:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-25 01:54:44 +0000 |
| commit | 45339b01d61586aa46c4ca98b37e320879fac050 (patch) | |
| tree | 736403e2da1ee308b2633b261dce4f2df63ff236 | |
| parent | 8bb3306b76bf3a20fc0f0634a492c5c18550c8e3 (diff) | |
| parent | 58570e7d5ef8ec486e6c91deee8d61b404dba25d (diff) | |
| download | platform_build-45339b01d61586aa46c4ca98b37e320879fac050.tar.gz platform_build-45339b01d61586aa46c4ca98b37e320879fac050.tar.bz2 platform_build-45339b01d61586aa46c4ca98b37e320879fac050.zip | |
Merge "Use consistent search depth."
| -rw-r--r-- | core/config.mk | 4 | ||||
| -rw-r--r-- | envsetup.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index e7ee49f009..8872ea9359 100644 --- a/core/config.mk +++ b/core/config.mk @@ -143,8 +143,8 @@ include $(BUILD_SYSTEM)/envsetup.mk 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)) diff --git a/envsetup.sh b/envsetup.sh index 2de2375168..d64bd29c1a 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1270,7 +1270,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 |