commit ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba
author Ying Wang <wangying@google.com> Wed Jun 30 16:34:52 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 30 16:34:52 2010 -0700
tree 1d59fd7ec18269a6df9aaa4a859eeb5395b242b9
parent 22d019b51d78684efc7fda70063a586e3e5ba8ea
parent 783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9

am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
  Don't copy apns-conf.xml for apps-only build

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 2d62b66..2f6b297 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -276,6 +276,7 @@
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y
 endif
 
+ifeq (,$(TARGET_BUILD_APPS))
 # 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 += \
@@ -296,6 +297,7 @@
     endif
   endif
 endif
+endif # !TARGET_BUILD_APPS
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android