diff options
| author | Ying Wang <wangying@google.com> | 2011-03-22 15:32:52 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-04-13 10:18:12 -0700 |
| commit | 7c1a1247f3e7110a95696671e8f71334e9b3c1b5 (patch) | |
| tree | 6c88702c68b9d9a76843db70b245097d5d751b66 /core/main.mk | |
| parent | 2218c027117b10fd909083c8c666bebb074c2167 (diff) | |
| download | build-7c1a1247f3e7110a95696671e8f71334e9b3c1b5.zip build-7c1a1247f3e7110a95696671e8f71334e9b3c1b5.tar.gz build-7c1a1247f3e7110a95696671e8f71334e9b3c1b5.tar.bz2 | |
Drop using vendor/google/etc/apns-conf.xml for eng builds.
Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/main.mk b/core/main.mk index e5824db..cd4aad2 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 |