commit 4eb079f67f7ec1dea9c430edfe6a2a589b3100d9
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 22 13:25:24 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Thu Mar 04 15:20:09 2010 -0800
tree b9d8bbd8238ef9d0e8f16d01ad208ef53df7e38c
parent f925cb322e693ce2e621dbad3fd1eb8579878710

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

This will allow to create open-sourceable product configurations.

Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e574124..4662a38 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -118,6 +118,7 @@
 board_config_mk := \
 	$(strip $(wildcard \
 		$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \
+		device/*/$(TARGET_DEVICE)/BoardConfig.mk \
 		vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \
 	))
 ifeq ($(board_config_mk),)

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index a9a24d2..5417242 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -23,7 +23,8 @@
 # $(call ) isn't necessary.
 #
 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
 endef