From 8d05416d613af2632eb3dd5763dee468a3b09034 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 22 Jan 2010 13:25:24 -0800
Subject: [PATCH] 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  | 1 +
 core/product.mk | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/config.mk b/core/config.mk
index f35b44e808..64a5dd0a10 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -122,6 +122,7 @@ 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 \
 	))
 ifeq ($(board_config_mk),)
diff --git a/core/product.mk b/core/product.mk
index a9a24d2b13..541724200e 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