commit b683895db83a16e29e073fa609aa9f5ddc176191
author Colin Cross <ccross@google.com> Wed Mar 28 09:34:16 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 28 09:34:16 2012 -0700
tree 0ac225854275cddc562d848926655c5045afcd0d
parent 89912bec232e5121b56231dc6a5ed173f54ed902
parent 8f4c3116b2480b89c37e7a0ca6d87681a09fd340

Merge "telephony: remove default apns_conf.xml"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index a038d5d..ed93a3c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -349,17 +349,6 @@
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y
 endif
 
-ifneq ($(BUILD_TINY_ANDROID),true)
-# Install an apns-conf.xml file if one's not already being installed.
-ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
-  PRODUCT_COPY_FILES += \
-        development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml
-  ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
-    $(warning implicitly installing apns-conf_sdk.xml)
-  endif
-endif
-endif
-
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
 
 # enable vm tracing in files for now to help track