From 7572f52897146d6435db7bdcbc05f3f6559e207a Mon Sep 17 00:00:00 2001
From: Dave Bort <dbort@android.com>
Date: Mon, 3 Nov 2008 15:54:13 -0800
Subject: [PATCH] Install apns-conf_sdk.xml if no other apns-conf.xml is
 specified

This should make data work in generic emulator builds.
---
 core/main.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 65035c2de8..159b19af26 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -165,15 +165,19 @@ endif
 override_build_tags := development
 ADDITIONAL_BUILD_PROPERTIES += xmpp.auto-presence=true
 ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes
-ifeq "" "$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))"
-  # Install an apns-conf.xml file if one's not already being installed.
-  PRODUCT_COPY_FILES += development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml
-endif
 else # !sdk
 # Enable sync for non-sdk builds only (sdk builds lack SubscribedFeedsProvider).
 ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes
 endif
 
+ifeq "" "$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))"
+  # Install an apns-conf.xml file if one's not already being installed.
+  PRODUCT_COPY_FILES += development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml
+  ifeq ($(filter sdk,$(MAKECMDGOALS)),)
+    $(warning implicitly installing apns-conf_sdk.xml)
+  endif
+endif
+
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
 
 # enable vm tracing in files for now to help track