commit 040221a9949c9f158cb7fc20b70b065289fcbbb1
author Scott Main <smain@google.com> Fri Jul 08 17:44:08 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 08 17:44:08 2011 -0700
tree fefaab9e055060ff869ff3e35d95e88378e71d79
parent 2c97d30fefed3430daa356418146d2cbb1f23c8f
parent 1e03253bf263472ea0028d2518292beaf4cbe01a

am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2

* commit '1e03253bf263472ea0028d2518292beaf4cbe01a':
  docs: fix xss vulnerability bug 5008593

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e5824db..cd4aad2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -323,18 +323,6 @@
     $(warning implicitly installing apns-conf_sdk.xml)
   endif
 endif
-# If we're on an eng or tests build, but not on the sdk, and we have
-# a better one, use that instead.
-ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
-  ifndef is_sdk_build
-    apns_to_use := $(wildcard vendor/google/etc/apns-conf.xml)
-    ifneq ($(strip $(apns_to_use)),)
-      PRODUCT_COPY_FILES := \
-            $(filter-out %:system/etc/apns-conf.xml,$(PRODUCT_COPY_FILES)) \
-            $(strip $(apns_to_use)):system/etc/apns-conf.xml
-    endif
-  endif
-endif
 endif
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android