From: Dima Zavin <dima@android.com>
Date: Tue, 27 Mar 2012 19:30:20 +0000 (-0700)
Subject: telephony: remove default apns_conf.xml
X-Git-Tag: android-x86-4.4-r1~1192^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8f4c3116b2480b89c37e7a0ca6d87681a09fd340;p=android-x86%2Fbuild.git

telephony: remove default apns_conf.xml

Remove the hack from main.mk to filter through installed files
to look for an apns file.

Change-Id: I31ba69bfc8323fea0a38154922df6b57a0f227c8
Signed-off-by: Dima Zavin <dima@android.com>
---

diff --git a/core/main.mk b/core/main.mk
index a038d5dcf..ed93a3c9b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -349,17 +349,6 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),)
   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