diff options
| -rw-r--r-- | sync/BUILD.gn | 60 | ||||
| -rw-r--r-- | sync/sync.gyp | 2 | ||||
| -rw-r--r-- | sync/sync_tests.gypi | 12 |
3 files changed, 37 insertions, 37 deletions
diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 605f797..e3d8f0d 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -24,8 +24,6 @@ source_set("sync_core") { "api/attachments/attachment_store.cc", "api/attachments/attachment_store.h", "api/string_ordinal.h", - "api/syncable_service.cc", - "api/syncable_service.h", "api/sync_change.cc", "api/sync_change.h", "api/sync_change_processor.cc", @@ -33,11 +31,13 @@ source_set("sync_core") { "api/sync_data.cc", "api/sync_data.h", "api/sync_error.cc", + "api/sync_error.h", "api/sync_error_factory.cc", "api/sync_error_factory.h", - "api/sync_error.h", "api/sync_merge_result.cc", "api/sync_merge_result.h", + "api/syncable_service.cc", + "api/syncable_service.h", "api/time.h", "base/sync_export.h", "engine/all_status.cc", @@ -47,11 +47,11 @@ source_set("sync_core") { "engine/backoff_delay_provider.cc", "engine/backoff_delay_provider.h", "engine/commit.cc", + "engine/commit.h", "engine/commit_contribution.cc", "engine/commit_contribution.h", "engine/commit_contributor.cc", "engine/commit_contributor.h", - "engine/commit.h", "engine/commit_processor.cc", "engine/commit_processor.h", "engine/commit_util.cc", @@ -100,6 +100,10 @@ source_set("sync_core") { "engine/sync_cycle_event.h", "engine/sync_engine_event_listener.cc", "engine/sync_engine_event_listener.h", + "engine/sync_scheduler.cc", + "engine/sync_scheduler.h", + "engine/sync_scheduler_impl.cc", + "engine/sync_scheduler_impl.h", "engine/syncer.cc", "engine/syncer.h", "engine/syncer_proto_util.cc", @@ -107,10 +111,6 @@ source_set("sync_core") { "engine/syncer_types.h", "engine/syncer_util.cc", "engine/syncer_util.h", - "engine/sync_scheduler.cc", - "engine/sync_scheduler.h", - "engine/sync_scheduler_impl.cc", - "engine/sync_scheduler_impl.h", "engine/traffic_logger.cc", "engine/traffic_logger.h", "engine/update_applicator.cc", @@ -181,15 +181,15 @@ source_set("sync_core") { "internal_api/public/base/invalidation_interface.cc", "internal_api/public/base/invalidation_interface.h", "internal_api/public/base/model_type.h", - "internal_api/public/base_node.h", "internal_api/public/base/node_ordinal.cc", "internal_api/public/base/node_ordinal.h", "internal_api/public/base/ordinal.h", "internal_api/public/base/progress_marker_map.cc", "internal_api/public/base/progress_marker_map.h", - "internal_api/public/base_transaction.h", "internal_api/public/base/unique_position.cc", "internal_api/public/base/unique_position.h", + "internal_api/public/base_node.h", + "internal_api/public/base_transaction.h", "internal_api/public/change_record.h", "internal_api/public/configure_reason.h", "internal_api/public/data_type_association_stats.cc", @@ -242,17 +242,17 @@ source_set("sync_core") { "internal_api/public/sync_encryption_handler.cc", "internal_api/public/sync_encryption_handler.h", "internal_api/public/sync_manager.cc", - "internal_api/public/sync_manager_factory.h", "internal_api/public/sync_manager.h", + "internal_api/public/sync_manager_factory.h", "internal_api/public/user_share.h", "internal_api/public/util/experiments.h", "internal_api/public/util/immutable.h", "internal_api/public/util/report_unrecoverable_error_function.h", "internal_api/public/util/sync_db_util.h", - "internal_api/public/util/syncer_error.cc", - "internal_api/public/util/syncer_error.h", "internal_api/public/util/sync_string_conversions.cc", "internal_api/public/util/sync_string_conversions.h", + "internal_api/public/util/syncer_error.cc", + "internal_api/public/util/syncer_error.h", "internal_api/public/util/unrecoverable_error_handler.h", "internal_api/public/util/unrecoverable_error_info.cc", "internal_api/public/util/unrecoverable_error_info.h", @@ -262,10 +262,6 @@ source_set("sync_core") { "internal_api/public/write_transaction.h", "internal_api/read_node.cc", "internal_api/read_transaction.cc", - "internal_api/syncapi_internal.cc", - "internal_api/syncapi_internal.h", - "internal_api/syncapi_server_connection_manager.cc", - "internal_api/syncapi_server_connection_manager.h", "internal_api/sync_backup_manager.cc", "internal_api/sync_backup_manager.h", "internal_api/sync_context.cc", @@ -278,10 +274,14 @@ source_set("sync_core") { "internal_api/sync_manager_factory.cc", "internal_api/sync_manager_impl.cc", "internal_api/sync_manager_impl.h", - "internal_api/sync_rollback_manager_base.cc", - "internal_api/sync_rollback_manager_base.h", "internal_api/sync_rollback_manager.cc", "internal_api/sync_rollback_manager.h", + "internal_api/sync_rollback_manager_base.cc", + "internal_api/sync_rollback_manager_base.h", + "internal_api/syncapi_internal.cc", + "internal_api/syncapi_internal.h", + "internal_api/syncapi_server_connection_manager.cc", + "internal_api/syncapi_server_connection_manager.h", "internal_api/user_share.cc", "internal_api/write_node.cc", "internal_api/write_transaction.cc", @@ -310,18 +310,18 @@ source_set("sync_core") { "sessions/status_controller.cc", "sessions/status_controller.h", "sessions/sync_session.cc", + "sessions/sync_session.h", "sessions/sync_session_context.cc", "sessions/sync_session_context.h", - "sessions/sync_session.h", "syncable/blob.h", "syncable/deferred_on_disk_directory_backing_store.cc", "syncable/deferred_on_disk_directory_backing_store.h", + "syncable/dir_open_result.h", + "syncable/directory.cc", + "syncable/directory.h", "syncable/directory_backing_store.cc", "syncable/directory_backing_store.h", - "syncable/directory.cc", "syncable/directory_change_delegate.h", - "syncable/directory.h", - "syncable/dir_open_result.h", "syncable/entry.cc", "syncable/entry.h", "syncable/entry_kernel.cc", @@ -348,6 +348,7 @@ source_set("sync_core") { "syncable/scoped_kernel_lock.h", "syncable/scoped_parent_child_index_updater.cc", "syncable/scoped_parent_child_index_updater.h", + "syncable/syncable-inl.h", "syncable/syncable_base_transaction.cc", "syncable/syncable_base_transaction.h", "syncable/syncable_base_write_transaction.cc", @@ -360,7 +361,6 @@ source_set("sync_core") { "syncable/syncable_enum_conversions.h", "syncable/syncable_id.cc", "syncable/syncable_id.h", - "syncable/syncable-inl.h", "syncable/syncable_model_neutral_write_transaction.cc", "syncable/syncable_model_neutral_write_transaction.h", "syncable/syncable_proto_util.cc", @@ -464,19 +464,19 @@ static_library("test_support_sync_core") { "test/mock_invalidation.h", "test/mock_invalidation_tracker.cc", "test/mock_invalidation_tracker.h", - "test/trackable_mock_invalidation.cc", - "test/trackable_mock_invalidation.h", "test/null_directory_change_delegate.cc", "test/null_directory_change_delegate.h", "test/null_transaction_observer.cc", "test/null_transaction_observer.h", - "test/sessions/test_scoped_session_event_listener.h", - "test/sessions/mock_debug_info_getter.h", "test/sessions/mock_debug_info_getter.cc", + "test/sessions/mock_debug_info_getter.h", + "test/sessions/test_scoped_session_event_listener.h", "test/test_directory_backing_store.cc", "test/test_directory_backing_store.h", "test/test_transaction_observer.cc", "test/test_transaction_observer.h", + "test/trackable_mock_invalidation.cc", + "test/trackable_mock_invalidation.h", "util/test_unrecoverable_error_handler.cc", "util/test_unrecoverable_error_handler.h", ] @@ -527,10 +527,10 @@ static_library("test_support_sync_internal_api") { static_library("test_support_sync_api") { testonly = true sources = [ - "api/fake_syncable_service.cc", - "api/fake_syncable_service.h", "api/fake_sync_change_processor.cc", "api/fake_sync_change_processor.h", + "api/fake_syncable_service.cc", + "api/fake_syncable_service.h", "api/sync_change_processor_wrapper_for_test.cc", "api/sync_change_processor_wrapper_for_test.h", "api/sync_error_factory_mock.cc", diff --git a/sync/sync.gyp b/sync/sync.gyp index ea0d354..1805955 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -270,7 +270,6 @@ 'internal_api/public/non_blocking_sync_common.h', 'internal_api/public/read_node.h', 'internal_api/public/read_transaction.h', - 'internal_api/public/shutdown_reason.h', 'internal_api/public/sessions/commit_counters.cc', 'internal_api/public/sessions/commit_counters.h', 'internal_api/public/sessions/model_neutral_state.cc', @@ -283,6 +282,7 @@ 'internal_api/public/sessions/type_debug_info_observer.h', 'internal_api/public/sessions/update_counters.cc', 'internal_api/public/sessions/update_counters.h', + 'internal_api/public/shutdown_reason.h', 'internal_api/public/sync_auth_provider.h', 'internal_api/public/sync_context.h', 'internal_api/public/sync_context_proxy.h', diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index bf41fc3..9bb8aa8 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -66,19 +66,19 @@ 'test/mock_invalidation.h', 'test/mock_invalidation_tracker.cc', 'test/mock_invalidation_tracker.h', - 'test/trackable_mock_invalidation.cc', - 'test/trackable_mock_invalidation.h', 'test/null_directory_change_delegate.cc', 'test/null_directory_change_delegate.h', 'test/null_transaction_observer.cc', 'test/null_transaction_observer.h', - 'test/sessions/test_scoped_session_event_listener.h', - 'test/sessions/mock_debug_info_getter.h', 'test/sessions/mock_debug_info_getter.cc', + 'test/sessions/mock_debug_info_getter.h', + 'test/sessions/test_scoped_session_event_listener.h', 'test/test_directory_backing_store.cc', 'test/test_directory_backing_store.h', 'test/test_transaction_observer.cc', 'test/test_transaction_observer.h', + 'test/trackable_mock_invalidation.cc', + 'test/trackable_mock_invalidation.h', 'util/test_unrecoverable_error_handler.cc', 'util/test_unrecoverable_error_handler.h', ], @@ -218,10 +218,10 @@ 'sync', ], 'sources': [ - 'api/fake_syncable_service.cc', - 'api/fake_syncable_service.h', 'api/fake_sync_change_processor.cc', 'api/fake_sync_change_processor.h', + 'api/fake_syncable_service.cc', + 'api/fake_syncable_service.h', 'api/sync_change_processor_wrapper_for_test.cc', 'api/sync_change_processor_wrapper_for_test.h', 'api/sync_error_factory_mock.cc', |