merge from open-source master
Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7
diff --git a/core/Makefile b/core/Makefile
index 2f316ca..46f5311 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -907,6 +907,7 @@
ifneq ($(TARGET_SIMULATOR),true)
ifneq ($(TARGET_PRODUCT),sdk)
ifneq ($(TARGET_PRODUCT),generic)
+ifneq ($(TARGET_PRODUCT),aosp_emulator_us)
name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -936,6 +937,7 @@
.PHONY: otapackage
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
+endif # TARGET_PRODUCT != aosp_emulator_us
endif # TARGET_PRODUCT != generic
endif # TARGET_PRODUCT != sdk
endif # TARGET_SIMULATOR != true
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),)
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
diff --git a/target/product/generic.mk b/target/product/generic.mk
index b4b1b09..8c85ca6 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -17,6 +17,7 @@
LatinIME \
Mms \
Music \
+ Provision \
Settings \
Sync \
Updater \