From 75e326486763e9b0a764a837cae38719b79cb329 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 24 Feb 2010 15:57:23 -0800
Subject: [PATCH 1/3] Don't build OTA package for aosp_emulator_us

This allows "make dist" to work on that configuration.

A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.

Change-Id: I47708025204a4991466abceb1708a3020a543238
---
 core/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/Makefile b/core/Makefile
index 2f316ca113..46f53117da 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -907,6 +907,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
 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 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
 .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

From 4eb079f67f7ec1dea9c430edfe6a2a589b3100d9 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 2/3] 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 e574124b15..4662a38095 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 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
 

From 29c6c01bd609a53a06ae8d5a167e1d35fa04ed26 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 4 Mar 2010 17:31:28 -0800
Subject: [PATCH 3/3] Add provisioning app in the generic build

Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
---
 target/product/generic.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/generic.mk b/target/product/generic.mk
index b4b1b09018..8c85ca68bb 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -17,6 +17,7 @@ PRODUCT_PACKAGES := \
     LatinIME \
     Mms \
     Music \
+    Provision \
     Settings \
     Sync \
     Updater \