Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdbcc65d authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '7c1a1247':
  Drop using vendor/google/etc/apns-conf.xml for eng builds.
parents 91c81750 7c1a1247

core/main.mk

+0 −12
Original line number Original line Diff line number Diff line
@@ -323,18 +323,6 @@ ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))) 
    $(warning implicitly installing apns-conf_sdk.xml)

    $(warning implicitly installing apns-conf_sdk.xml)

  endif

  endif

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

endif





ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android

ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android