Merge change 3569
* changes: Fix the is_sdk_build check when installing the apns.
This commit is contained in:
@@ -228,7 +228,7 @@ endif
|
|||||||
# If we're on an eng or tests build, but not on the sdk, and we have
|
# If we're on an eng or tests build, but not on the sdk, and we have
|
||||||
# a better one, use that instead.
|
# a better one, use that instead.
|
||||||
ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
|
ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
|
||||||
ifdef is_sdk_build
|
ifndef is_sdk_build
|
||||||
apns_to_use := $(wildcard vendor/google/etc/apns-conf.xml)
|
apns_to_use := $(wildcard vendor/google/etc/apns-conf.xml)
|
||||||
ifneq ($(strip $(apns_to_use)),)
|
ifneq ($(strip $(apns_to_use)),)
|
||||||
PRODUCT_COPY_FILES := \
|
PRODUCT_COPY_FILES := \
|
||||||
|
Reference in New Issue
Block a user