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
This commit is contained in:
Ying Wang 2010-06-30 16:34:52 -07:00 committed by Android Git Automerger
commit ca88861ba6

View file

@ -276,6 +276,7 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),)
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 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
endif
endif
endif
endif # !TARGET_BUILD_APPS
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android