diff options
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/core/main.mk b/core/main.mk index a19beba..37c580d 100644 --- a/core/main.mk +++ b/core/main.mk @@ -201,13 +201,26 @@ else # !sdk ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes endif -ifeq "" "$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))" - # Install an apns-conf.xml file if one's not already being installed. - PRODUCT_COPY_FILES += development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml - ifeq ($(filter sdk,$(MAKECMDGOALS)),) +# 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 += \ + development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml + ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) $(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)),) + ifeq ($(filter sdk,$(MAKECMDGOALS)),) + 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 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android |