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

Commit ed813e2b authored by Ying Wang's avatar Ying Wang Committed by Steve Kondik
Browse files

Don't copy apns-conf.xml for apps-only build 

http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
parent 1fc1940a

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,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 += \
@@ -297,6 +298,7 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) 
    endif

  endif

endif

endif # !TARGET_BUILD_APPS



ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android