diff --git a/core/main.mk b/core/main.mk index ae7abb62e..32d67e9b6 100644 --- a/core/main.mk +++ b/core/main.mk @@ -282,6 +282,7 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),) ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y endif +ifeq (,$(TARGET_BUILD_APPS)) # 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 += \ @@ -302,6 +303,7 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) endif endif endif +endif # !TARGET_BUILD_APPS ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android