Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca88861b authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

Merge commit '783f449b' into gingerbread

* commit '783f449b':
  Don't copy apns-conf.xml for apps-only build
parents 22d019b5 783f449b

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -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