From 6a769427c85343e85fe733b1a7c6115b3c8ef291 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <>
Date: Mon, 6 Apr 2009 20:30:02 -0700
Subject: [PATCH] AI 144765: am: CL 144764 Fix the SDK build to properly
 package what needs to go in the system image (bug #1761105)   Original
 author: xav   Merged from: //branches/cupcake/...

Automated import of CL 144765
---
 core/main.mk          | 2 +-
 target/product/sdk.mk | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 815745b0b1..04e9728f28 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -193,7 +193,7 @@ $(error The 'sdk' target may not be specified with any other targets)
 endif
 # TODO: this should be eng I think.  Since the sdk is built from the eng
 # variant.
-tags_to_install := user
+tags_to_install := user debug eng
 ADDITIONAL_BUILD_PROPERTIES += xmpp.auto-presence=true
 ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes
 else # !sdk
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index b0c7d80a86..2f5165abe3 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -10,7 +10,6 @@ PRODUCT_PACKAGES := \
 	Fallback \
 	GPSEnable \
 	Launcher \
-	Maps \
 	Music \
 	Mms \
 	Settings \