Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45339b01 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Use consistent search depth."

parents 8bb3306b 58570e7d

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -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))

envsetup.sh

+2 −1
Original line number Diff line number Diff line
@@ -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