AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in...

  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 144765

diff --git a/core/main.mk b/core/main.mk
index 815745b..04e9728 100644 (file)
--- 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 b0c7d80..2f5165a 100644 (file)
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -10,7 +10,6 @@ PRODUCT_PACKAGES := \
        Fallback \
        GPSEnable \
        Launcher \
-       Maps \
        Music \
        Mms \
        Settings \