StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Ying Wang
2010-06-30 15:21:27 -07:00
parent 0af605f3b6
commit 783f449bdc
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/main.mk
View File

@@ -282,6 +282,7 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),)
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y
endif endif
ifeq (,$(TARGET_BUILD_APPS))
# Install an apns-conf.xml file if one's not already being installed. # Install an apns-conf.xml file if one's not already being installed.
ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))) ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@@ -302,6 +303,7 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
endif endif
endif endif
endif endif
endif # !TARGET_BUILD_APPS
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android