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

Commit 357f5bc8 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I7397e6fe into eclair 

* changes:
  add the new accounts and sync package to the generic target and enable sync for all builds
parents 24fbbfaa 170e1d59

core/main.mk

+1 −2
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ tags_to_install := user debug eng 
ADDITIONAL_BUILD_PROPERTIES += xmpp.auto-presence=true

ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes

else # !sdk

# Enable sync for non-sdk builds only (sdk builds lack SubscribedFeedsProvider).

ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes

endif



## precise GC ##
@@ -288,6 +286,7 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) 
endif



ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android

ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes



# enable vm tracing in files for now to help track

# the cause of ANRs in the content process

target/product/generic.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# you should derive from generic_with_google.mk



PRODUCT_PACKAGES := \

    AccountAndSyncSettings \

    AlarmClock \

    AlarmProvider \

    Bluetooth \
@@ -20,7 +21,6 @@ PRODUCT_PACKAGES := \ 
    Sync \

    Updater \

    CalendarProvider \

    SubscribedFeedsProvider \

    SyncProvider



$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)

target/product/sdk.mk

+1 −0
Original line number Diff line number Diff line 
PRODUCT_PROPERTY_OVERRIDES :=



PRODUCT_PACKAGES := \

	AccountAndSyncSettings \

	AlarmClock \

	Camera \

	Calculator \