Sort more instances of wildcard and find
Many of these may not make a difference in the output images, but it's a
good idea to keep the make system as repeatable as possible.
Change-Id: I31804b8ad5805148ed08be7426a242a16f4d0df3
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 2899d80..772b294 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -134,11 +134,11 @@
# make sure only one exists.
# Real boards should always be associated with an OEM vendor.
board_config_mk := \
- $(strip $(wildcard \
+ $(strip $(sort $(wildcard \
$(SRC_TARGET_DIR)/board/$(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))
endif