diff options
| author | Fred Quintana <fredq@google.com> | 2009-11-03 15:04:59 -0800 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2009-11-03 16:05:03 -0800 |
| commit | 170e1d59f6cf8176c30a5672267fb8be6d1076c6 (patch) | |
| tree | d7862ed4f653f4ef3654243c77f9a05edc8aada4 | |
| parent | ec4194ef1baa2906f916a01e368bb5d6805ba245 (diff) | |
| download | build-170e1d59f6cf8176c30a5672267fb8be6d1076c6.tar.gz | |
add the new accounts and sync package to the generic target and enable sync for all builds
| -rw-r--r-- | core/main.mk | 3 | ||||
| -rw-r--r-- | target/product/generic.mk | 2 | ||||
| -rw-r--r-- | target/product/sdk.mk | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/main.mk b/core/main.mk index a07172d78e..9986f94678 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 diff --git a/target/product/generic.mk b/target/product/generic.mk index e7c1e7bd45..b4b1b09018 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -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) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 210bd9c8b7..f35de85fef 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -1,6 +1,7 @@ PRODUCT_PROPERTY_OVERRIDES := PRODUCT_PACKAGES := \ + AccountAndSyncSettings \ AlarmClock \ Camera \ Calculator \ |