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

am bdbcc65d: am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.

Browse Source 
* commit 'bdbcc65d0ee98187f447bc2ae3b421dd2ffd0540':
  Drop using vendor/google/etc/apns-conf.xml for eng builds.
This commit is contained in:
Ying Wang
2011-04-13 10:34:14 -07:00
committed by Android Git Automerger
parent 6bb42fb0a6 bdbcc65d0e
commit c3dd0e62c0
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/main.mk
View File

@@ -323,18 +323,6 @@ ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
$(warning implicitly installing apns-conf_sdk.xml)
endif
endif
# If we're on an eng or tests build, but not on the sdk, and we have
# a better one, use that instead.
ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
ifndef is_sdk_build
apns_to_use := $(wildcard vendor/google/etc/apns-conf.xml)
ifneq ($(strip $(apns_to_use)),)
PRODUCT_COPY_FILES := \
$(filter-out %:system/etc/apns-conf.xml,$(PRODUCT_COPY_FILES)) \
$(strip $(apns_to_use)):system/etc/apns-conf.xml
endif
endif
endif
endif
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android