diff --git a/core/config.mk b/core/config.mk
index e574124b155b532c2f191f07ec7e3cc53ac61dc6..4662a3809573554a15acb19cea84ce9ddfb0bca3 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -118,6 +118,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 a9a24d2b1349c978b4900bff14d6cd29934551a2..541724200e87cfe2591e062b7039998b8874fbf0 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