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

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

Browse Source 
Merge commit 'ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba' into gingerbread-plus-aosp

* commit 'ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba':
  Don't copy apns-conf.xml for apps-only build
This commit is contained in:
Ying Wang
2010-06-30 16:37:02 -07:00
committed by Android Git Automerger
parent 17df905a9b ca88861ba6
commit 9fd6b635d4
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

@@ -276,6 +276,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 += \
@@ -296,6 +297,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