StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Look for product configs in device/ in addition to vendor/"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-02-05 07:16:34 -08:00
committed by Android (Google) Code Review
parent 14833605d2 8d05416d61
commit 29544b21fb
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/config.mk
View File

@@ -122,6 +122,7 @@ include $(BUILD_SYSTEM)/envsetup.mk
board_config_mk := \ board_config_mk := \
$(strip $(wildcard \ $(strip $(wildcard \
$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \ $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \
device/*/$(TARGET_DEVICE)/BoardConfig.mk \
vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \ vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \
)) ))
ifeq ($(board_config_mk),) ifeq ($(board_config_mk),)

3
core/product.mk
View File

@@ -23,7 +23,8 @@
# $(call ) isn't necessary. # $(call ) isn't necessary.
# #
define _find-android-products-files define _find-android-products-files
$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \ $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk) \
$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \
$(SRC_TARGET_DIR)/product/AndroidProducts.mk $(SRC_TARGET_DIR)/product/AndroidProducts.mk
endef endef