summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-01 23:41:44 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-01 23:41:44 +0000
commita579f97a55d027dd38187bc9a801e528e91a6500 (patch)
tree97801a9a7bb15b9c0e96f4245b78bd9c2507ba4e
parentc5bbe0e28607eaec46fe76ee44292daa9784e22c (diff)
downloadchromium_src-a579f97a55d027dd38187bc9a801e528e91a6500.zip
chromium_src-a579f97a55d027dd38187bc9a801e528e91a6500.tar.gz
chromium_src-a579f97a55d027dd38187bc9a801e528e91a6500.tar.bz2
Refactor build target for sync
Refactors the sync build target definition to fit the more common pattern. The old target was defined differently in component and non-component mode. This is brittle compared to the more standard pattern of setting the target type to '<(component)'. Introduces a shim target with type 'none'. Any target that depends on this shim will link inherit its dependency on the two sync libraries. A note on the history of this, for those who are interested: This pattern was recommended during the original componentization of sync almost two years ago. The pattern was, and still is, used by content.gyp to ensure that dependency restrictions are being respected. The difference with sync is that it doesn't actually make use of fine-grained dependencies. It's not unusual to see a target depend on conent_renderer, content_browser, or some other static library sub-component of content. With sync, on the other hand, we have the rule that other targets may depend only on the top level sync target. Since no one aside from sync depends on sync_internal_api, sync_core, or sync_api static library targets, and we have no intention of exposing these sub-components outside of sync, there's no point in maintaining them as separate targets. BUG=397574 Review URL: https://codereview.chromium.org/425803013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287119 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--sync/protocol/BUILD.gn6
-rw-r--r--sync/protocol/sync_proto_export.h29
-rw-r--r--sync/sync.gyp589
-rw-r--r--sync/sync_api.gypi51
-rw-r--r--sync/sync_core.gypi222
-rw-r--r--sync/sync_internal_api.gypi170
-rw-r--r--sync/sync_proto.gypi64
7 files changed, 524 insertions, 607 deletions
diff --git a/sync/protocol/BUILD.gn b/sync/protocol/BUILD.gn
index de4376f..d6e233b 100644
--- a/sync/protocol/BUILD.gn
+++ b/sync/protocol/BUILD.gn
@@ -47,10 +47,10 @@ proto_library("protocol") {
"unique_position.proto",
]
- cc_generator_options = "dllexport_decl=SYNC_EXPORT:"
- cc_include = "sync/base/sync_export.h"
+ cc_generator_options = "dllexport_decl=SYNC_PROTO_EXPORT:"
+ cc_include = "sync/protocol/sync_proto_export.h"
- defines = [ "SYNC_IMPLEMENTATION" ]
+ defines = [ "SYNC_PROTO_IMPLEMENTATION" ]
extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
}
diff --git a/sync/protocol/sync_proto_export.h b/sync/protocol/sync_proto_export.h
new file mode 100644
index 0000000..53098f9
--- /dev/null
+++ b/sync/protocol/sync_proto_export.h
@@ -0,0 +1,29 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SYNC_PROTOCOL_SYNC_PROTO_EXPORT_H_
+#define SYNC_PROTOCOL_SYNC_PROTO_EXPORT_H_
+
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+
+#if defined(SYNC_PROTO_IMPLEMENTATION)
+#define SYNC_PROTO_EXPORT __declspec(dllexport)
+#else
+#define SYNC_PROTO_EXPORT __declspec(dllimport)
+#endif // defined(SYNC_PROTO_IMPLEMENTATION)
+
+#else // defined(WIN32)
+#if defined(SYNC_PROTO_IMPLEMENTATION)
+#define SYNC_PROTO_EXPORT __attribute__((visibility("default")))
+#else
+#define SYNC_PROTO_EXPORT
+#endif // defined(SYNC_IMPLEMENTATION)
+#endif
+
+#else // defined(COMPONENT_BUILD)
+#define SYNC_PROTO_EXPORT
+#endif
+
+#endif // SYNC_PROTOCOL_SYNC_PROTO_EXPORT_H_
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 3a840e1..d7bfb1a 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -12,108 +12,503 @@
'sync_tests.gypi',
],
- 'conditions': [
- # Notes:
- # 1) In static mode, the public 'sync' target has a target type of 'none',
- # and is composed of the static library targets 'sync_api', 'sync_core',
- # 'sync_internal_api', and 'sync_proto'.
- # 2) In component mode, we build the public 'sync' target into a single DLL,
- # which includes the contents of sync_api.gypi, sync_core.gypi,
- # sync_internal_api.gypi, and sync_proto.gypi.
- # 3) All external targets that depend on anything in sync/ must simply
- # declare a dependency on 'sync.gyp:sync'
- ['component=="static_library"', {
- 'targets': [
- # The public sync static library target.
- {
- 'target_name': 'sync',
- 'type': 'none',
- 'dependencies': [
- 'sync_api',
- 'sync_core',
- 'sync_internal_api',
- 'sync_proto',
- ],
- 'export_dependent_settings': [
- 'sync_proto',
- ],
- },
-
- # The sync external API library.
- {
- 'target_name': 'sync_api',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'sync_api.gypi',
- ],
- 'dependencies': [
- 'sync_internal_api',
- 'sync_proto',
- ],
- },
+ 'targets': [
+ # This target will add '-lsync_core' and '-lsync_proto' to the link line of
+ # targets that depend on it. Anything that depends on sync code should
+ # declare a dependency on this target.
+ {
+ 'target_name': 'sync',
+ 'type': 'none',
+ 'dependencies': [
+ 'sync_core',
+ 'sync_proto',
+ ],
+ 'export_dependent_settings': [
+ 'sync_proto',
+ ],
+ },
- # The core sync library.
- {
- 'target_name': 'sync_core',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'sync_core.gypi',
- ],
- 'dependencies': [
- 'sync_proto',
- ],
- 'export_dependent_settings': [
- 'sync_proto',
- ],
- },
+ # Contains everything related to sync implementation that does not depend
+ # on chrome/ or components/. Do not depend on this directly. Depend on
+ # the 'sync' target to get the sync protobufs, too.
+ {
+ 'target_name': 'sync_core',
+ 'type': '<(component)',
+ 'variables': { 'enable_wexit_time_desctructors': 1, },
+ 'defines': [
+ 'SYNC_IMPLEMENTATION',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../crypto/crypto.gyp:crypto',
+ '../google_apis/google_apis.gyp:google_apis',
+ '../net/net.gyp:net',
+ '../sql/sql.gyp:sql',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../url/url.gyp:url_lib',
+ 'sync_proto',
+ ],
+ 'export_dependent_settings': [
+ 'sync_proto',
+ ],
+ 'sources': [
+ 'api/attachments/attachment.cc',
+ 'api/attachments/attachment.h',
+ 'api/attachments/attachment_downloader.cc',
+ 'api/attachments/attachment_downloader.h',
+ 'api/attachments/attachment_id.cc',
+ 'api/attachments/attachment_id.h',
+ 'api/attachments/attachment_service.cc',
+ 'api/attachments/attachment_service.h',
+ 'api/attachments/attachment_service_impl.cc',
+ 'api/attachments/attachment_service_impl.h',
+ 'api/attachments/attachment_service_proxy.cc',
+ 'api/attachments/attachment_service_proxy.h',
+ 'api/attachments/attachment_service_proxy_for_test.cc',
+ 'api/attachments/attachment_service_proxy_for_test.h',
+ 'api/attachments/attachment_store.cc',
+ 'api/attachments/attachment_store.h',
+ 'api/attachments/attachment_uploader.cc',
+ 'api/attachments/attachment_uploader.h',
+ 'api/string_ordinal.h',
+ 'api/sync_change.cc',
+ 'api/sync_change.h',
+ 'api/sync_change_processor.cc',
+ 'api/sync_change_processor.h',
+ '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_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',
+ 'engine/all_status.h',
+ 'engine/apply_control_data_updates.cc',
+ 'engine/apply_control_data_updates.h',
+ '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_processor.cc',
+ 'engine/commit_processor.h',
+ 'engine/commit_util.cc',
+ 'engine/commit_util.h',
+ 'engine/conflict_resolver.cc',
+ 'engine/conflict_resolver.h',
+ 'engine/conflict_util.cc',
+ 'engine/conflict_util.h',
+ 'engine/cryptographer_provider.cc',
+ 'engine/cryptographer_provider.h',
+ 'engine/directory_commit_contribution.cc',
+ 'engine/directory_commit_contribution.h',
+ 'engine/directory_commit_contributor.cc',
+ 'engine/directory_commit_contributor.h',
+ 'engine/directory_cryptographer_provider.cc',
+ 'engine/directory_cryptographer_provider.h',
+ 'engine/directory_update_handler.cc',
+ 'engine/directory_update_handler.h',
+ 'engine/entity_tracker.cc',
+ 'engine/entity_tracker.h',
+ 'engine/get_commit_ids.cc',
+ 'engine/get_commit_ids.h',
+ 'engine/get_updates_delegate.cc',
+ 'engine/get_updates_delegate.h',
+ 'engine/get_updates_processor.cc',
+ 'engine/get_updates_processor.h',
+ 'engine/model_type_entity.cc',
+ 'engine/model_type_entity.h',
+ 'engine/model_type_sync_proxy.cc',
+ 'engine/model_type_sync_proxy.h',
+ 'engine/model_type_sync_proxy_impl.cc',
+ 'engine/model_type_sync_proxy_impl.h',
+ 'engine/model_type_sync_worker.cc',
+ 'engine/model_type_sync_worker.h',
+ 'engine/model_type_sync_worker_impl.cc',
+ 'engine/model_type_sync_worker_impl.h',
+ 'engine/net/server_connection_manager.cc',
+ 'engine/net/server_connection_manager.h',
+ 'engine/net/url_translator.cc',
+ 'engine/net/url_translator.h',
+ 'engine/non_blocking_type_commit_contribution.cc',
+ 'engine/non_blocking_type_commit_contribution.h',
+ 'engine/nudge_handler.cc',
+ 'engine/nudge_handler.h',
+ 'engine/nudge_source.cc',
+ 'engine/nudge_source.h',
+ 'engine/process_updates_util.cc',
+ 'engine/process_updates_util.h',
+ 'engine/sync_cycle_event.cc',
+ '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',
+ 'engine/syncer_proto_util.h',
+ 'engine/syncer_types.h',
+ 'engine/syncer_util.cc',
+ 'engine/syncer_util.h',
+ 'engine/traffic_logger.cc',
+ 'engine/traffic_logger.h',
+ 'engine/update_applicator.cc',
+ 'engine/update_applicator.h',
+ 'engine/update_handler.cc',
+ 'engine/update_handler.h',
+ 'internal_api/attachments/attachment_downloader_impl.cc',
+ 'internal_api/attachments/attachment_uploader_impl.cc',
+ 'internal_api/attachments/fake_attachment_downloader.cc',
+ 'internal_api/attachments/fake_attachment_store.cc',
+ 'internal_api/attachments/fake_attachment_uploader.cc',
+ 'internal_api/base_node.cc',
+ 'internal_api/base_transaction.cc',
+ 'internal_api/change_record.cc',
+ 'internal_api/change_reorder_buffer.cc',
+ 'internal_api/change_reorder_buffer.h',
+ 'internal_api/debug_info_event_listener.cc',
+ 'internal_api/debug_info_event_listener.h',
+ 'internal_api/delete_journal.cc',
+ 'internal_api/events/commit_request_event.cc',
+ 'internal_api/events/commit_response_event.cc',
+ 'internal_api/events/configure_get_updates_request_event.cc',
+ 'internal_api/events/get_updates_response_event.cc',
+ 'internal_api/events/normal_get_updates_request_event.cc',
+ 'internal_api/events/poll_get_updates_request_event.cc',
+ 'internal_api/events/protocol_event.cc',
+ 'internal_api/http_bridge.cc',
+ 'internal_api/http_bridge_network_resources.cc',
+ 'internal_api/internal_components_factory_impl.cc',
+ 'internal_api/js_mutation_event_observer.cc',
+ 'internal_api/js_mutation_event_observer.h',
+ 'internal_api/js_sync_encryption_handler_observer.cc',
+ 'internal_api/js_sync_encryption_handler_observer.h',
+ 'internal_api/js_sync_manager_observer.cc',
+ 'internal_api/js_sync_manager_observer.h',
+ 'internal_api/protocol_event_buffer.cc',
+ 'internal_api/protocol_event_buffer.h',
+ 'internal_api/public/attachments/attachment_downloader_impl.h',
+ 'internal_api/public/attachments/attachment_uploader_impl.h',
+ 'internal_api/public/attachments/fake_attachment_downloader.h',
+ 'internal_api/public/attachments/fake_attachment_store.h',
+ 'internal_api/public/attachments/fake_attachment_uploader.h',
+ 'internal_api/public/base/attachment_id_proto.cc',
+ 'internal_api/public/base/attachment_id_proto.h',
+ 'internal_api/public/base/cancelation_observer.cc',
+ 'internal_api/public/base/cancelation_observer.h',
+ 'internal_api/public/base/cancelation_signal.cc',
+ 'internal_api/public/base/cancelation_signal.h',
+ 'internal_api/public/base/enum_set.h',
+ 'internal_api/public/base/enum_set.h',
+ '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_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/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',
+ 'internal_api/public/data_type_association_stats.h',
+ 'internal_api/public/data_type_debug_info_listener.cc',
+ 'internal_api/public/data_type_debug_info_listener.h',
+ 'internal_api/public/delete_journal.h',
+ 'internal_api/public/engine/model_safe_worker.cc',
+ 'internal_api/public/engine/model_safe_worker.h',
+ 'internal_api/public/engine/passive_model_worker.cc',
+ 'internal_api/public/engine/passive_model_worker.h',
+ 'internal_api/public/engine/polling_constants.cc',
+ 'internal_api/public/engine/polling_constants.h',
+ 'internal_api/public/engine/sync_status.cc',
+ 'internal_api/public/engine/sync_status.h',
+ 'internal_api/public/events/commit_request_event.h',
+ 'internal_api/public/events/commit_response_event.h',
+ 'internal_api/public/events/configure_get_updates_request_event.h',
+ 'internal_api/public/events/get_updates_response_event.h',
+ 'internal_api/public/events/normal_get_updates_request_event.h',
+ 'internal_api/public/events/poll_get_updates_request_event.h',
+ 'internal_api/public/events/protocol_event.h',
+ 'internal_api/public/http_bridge.h',
+ 'internal_api/public/http_bridge_network_resources.h',
+ 'internal_api/public/http_post_provider_factory.h',
+ 'internal_api/public/http_post_provider_interface.h',
+ 'internal_api/public/internal_components_factory.h',
+ 'internal_api/public/internal_components_factory_impl.h',
+ 'internal_api/public/network_resources.h',
+ 'internal_api/public/non_blocking_sync_common.cc',
+ 'internal_api/public/non_blocking_sync_common.h',
+ 'internal_api/public/read_node.h',
+ 'internal_api/public/read_transaction.h',
+ 'internal_api/public/sessions/commit_counters.cc',
+ 'internal_api/public/sessions/commit_counters.h',
+ 'internal_api/public/sessions/model_neutral_state.cc',
+ 'internal_api/public/sessions/model_neutral_state.h',
+ 'internal_api/public/sessions/status_counters.cc',
+ 'internal_api/public/sessions/status_counters.h',
+ 'internal_api/public/sessions/sync_session_snapshot.cc',
+ 'internal_api/public/sessions/sync_session_snapshot.h',
+ 'internal_api/public/sessions/type_debug_info_observer.cc',
+ '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/sync_auth_provider.h',
+ 'internal_api/public/sync_context.h',
+ 'internal_api/public/sync_context_proxy.h',
+ '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.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/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',
+ 'internal_api/public/util/weak_handle.cc',
+ 'internal_api/public/util/weak_handle.h',
+ 'internal_api/public/write_node.h',
+ 'internal_api/public/write_transaction.h',
+ 'internal_api/read_node.cc',
+ 'internal_api/read_transaction.cc',
+ 'internal_api/sync_backup_manager.cc',
+ 'internal_api/sync_backup_manager.h',
+ 'internal_api/sync_context.cc',
+ 'internal_api/sync_context_proxy.cc',
+ 'internal_api/sync_context_proxy_impl.cc',
+ 'internal_api/sync_context_proxy_impl.h',
+ 'internal_api/sync_db_util.cc',
+ 'internal_api/sync_encryption_handler_impl.cc',
+ 'internal_api/sync_encryption_handler_impl.h',
+ 'internal_api/sync_manager_factory.cc',
+ 'internal_api/sync_manager_impl.cc',
+ 'internal_api/sync_manager_impl.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',
+ 'js/js_backend.h',
+ 'js/js_controller.h',
+ 'js/js_event_details.cc',
+ 'js/js_event_details.h',
+ 'js/js_event_handler.h',
+ 'js/sync_js_controller.cc',
+ 'js/sync_js_controller.h',
+ 'protocol/proto_enum_conversions.cc',
+ 'protocol/proto_enum_conversions.h',
+ 'protocol/proto_value_conversions.cc',
+ 'protocol/proto_value_conversions.h',
+ 'protocol/sync_protocol_error.cc',
+ 'protocol/sync_protocol_error.h',
+ 'sessions/data_type_tracker.cc',
+ 'sessions/data_type_tracker.h',
+ 'sessions/debug_info_getter.h',
+ 'sessions/directory_type_debug_info_emitter.cc',
+ 'sessions/directory_type_debug_info_emitter.h',
+ 'sessions/model_type_registry.cc',
+ 'sessions/model_type_registry.h',
+ 'sessions/nudge_tracker.cc',
+ 'sessions/nudge_tracker.h',
+ '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',
+ 'syncable/blob.h',
+ 'syncable/dir_open_result.h',
+ 'syncable/directory.cc',
+ 'syncable/directory.h',
+ 'syncable/directory_backing_store.cc',
+ 'syncable/directory_backing_store.h',
+ 'syncable/directory_change_delegate.h',
+ 'syncable/entry.cc',
+ 'syncable/entry.h',
+ 'syncable/entry_kernel.cc',
+ 'syncable/entry_kernel.h',
+ 'syncable/in_memory_directory_backing_store.cc',
+ 'syncable/in_memory_directory_backing_store.h',
+ 'syncable/invalid_directory_backing_store.cc',
+ 'syncable/invalid_directory_backing_store.h',
+ 'syncable/metahandle_set.h',
+ 'syncable/model_neutral_mutable_entry.cc',
+ 'syncable/model_neutral_mutable_entry.h',
+ 'syncable/model_type.cc',
+ 'syncable/mutable_entry.cc',
+ 'syncable/mutable_entry.h',
+ 'syncable/nigori_handler.cc',
+ 'syncable/nigori_handler.h',
+ 'syncable/nigori_util.cc',
+ 'syncable/nigori_util.h',
+ 'syncable/on_disk_directory_backing_store.cc',
+ 'syncable/on_disk_directory_backing_store.h',
+ 'syncable/parent_child_index.cc',
+ 'syncable/parent_child_index.h',
+ 'syncable/scoped_kernel_lock.cc',
+ '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',
+ 'syncable/syncable_base_write_transaction.h',
+ 'syncable/syncable_changes_version.h',
+ 'syncable/syncable_columns.h',
+ 'syncable/syncable_delete_journal.cc',
+ 'syncable/syncable_delete_journal.h',
+ 'syncable/syncable_enum_conversions.cc',
+ 'syncable/syncable_enum_conversions.h',
+ 'syncable/syncable_id.cc',
+ 'syncable/syncable_id.h',
+ 'syncable/syncable_model_neutral_write_transaction.cc',
+ 'syncable/syncable_model_neutral_write_transaction.h',
+ 'syncable/syncable_proto_util.cc',
+ 'syncable/syncable_proto_util.h',
+ 'syncable/syncable_read_transaction.cc',
+ 'syncable/syncable_read_transaction.h',
+ 'syncable/syncable_util.cc',
+ 'syncable/syncable_util.h',
+ 'syncable/syncable_write_transaction.cc',
+ 'syncable/syncable_write_transaction.h',
+ 'syncable/transaction_observer.h',
+ 'syncable/write_transaction_info.cc',
+ 'syncable/write_transaction_info.h',
+ 'util/cryptographer.cc',
+ 'util/cryptographer.h',
+ 'util/data_type_histogram.h',
+ 'util/encryptor.h',
+ 'util/extensions_activity.cc',
+ 'util/extensions_activity.h',
+ 'util/get_session_name.cc',
+ 'util/get_session_name.h',
+ 'util/get_session_name_ios.h',
+ 'util/get_session_name_ios.mm',
+ 'util/get_session_name_linux.cc',
+ 'util/get_session_name_linux.h',
+ 'util/get_session_name_mac.h',
+ 'util/get_session_name_mac.mm',
+ 'util/get_session_name_win.cc',
+ 'util/get_session_name_win.h',
+ 'util/logging.cc',
+ 'util/logging.h',
+ 'util/nigori.cc',
+ 'util/nigori.h',
+ 'util/time.cc',
+ 'util/time.h',
+ ],
- # The sync internal API library.
- {
- 'target_name': 'sync_internal_api',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'sync_internal_api.gypi',
- ],
+ 'conditions': [
+ ['OS=="linux" and chromeos==1', {
+ # Required by get_session_name.cc on Chrome OS.
'dependencies': [
- 'sync_core',
- 'sync_proto',
- ],
- 'export_dependent_settings': [
- 'sync_core',
- 'sync_proto',
- ],
- },
-
- # The sync protocol buffer library.
- {
- # GN version: //sync/protocol
- 'target_name': 'sync_proto',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'sync_proto.gypi',
- ],
- },
+ '../chromeos/chromeos.gyp:chromeos',
+ ],
+ }],
],
},
- { # component != static_library
- 'targets': [
- # The public sync shared library target.
- {
- 'target_name': 'sync',
- 'type': 'shared_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'sync_api.gypi',
- 'sync_core.gypi',
- 'sync_internal_api.gypi',
- 'sync_proto.gypi',
- ],
- },
+ {
+ # Contains sync protobuf definitions. Do not depend on this directly.
+ # Depend on the 'sync' target to get the relevant C++ code, too.
+ #
+ # GN version: //sync/protocol
+ 'target_name': 'sync_proto',
+ 'type': '<(component)',
+ 'include_dirs': [
+ '..',
],
- }],
+ 'defines': [
+ 'SYNC_PROTO_IMPLEMENTATION',
+ ],
+ 'sources': [
+ # NOTE: If you add a file to this list, also add it to
+ # sync/protocol/BUILD.gn
+ 'protocol/app_notification_specifics.proto',
+ 'protocol/app_setting_specifics.proto',
+ 'protocol/app_specifics.proto',
+ 'protocol/app_list_specifics.proto',
+ 'protocol/article_specifics.proto',
+ 'protocol/attachments.proto',
+ 'protocol/autofill_specifics.proto',
+ 'protocol/bookmark_specifics.proto',
+ 'protocol/client_commands.proto',
+ 'protocol/client_debug_info.proto',
+ 'protocol/device_info_specifics.proto',
+ 'protocol/dictionary_specifics.proto',
+ 'protocol/encryption.proto',
+ 'protocol/experiments_specifics.proto',
+ 'protocol/extension_setting_specifics.proto',
+ 'protocol/extension_specifics.proto',
+ 'protocol/favicon_image_specifics.proto',
+ 'protocol/favicon_tracking_specifics.proto',
+ 'protocol/get_updates_caller_info.proto',
+ 'protocol/history_delete_directive_specifics.proto',
+ 'protocol/nigori_specifics.proto',
+ 'protocol/managed_user_setting_specifics.proto',
+ 'protocol/managed_user_shared_setting_specifics.proto',
+ 'protocol/managed_user_specifics.proto',
+ 'protocol/password_specifics.proto',
+ 'protocol/preference_specifics.proto',
+ 'protocol/priority_preference_specifics.proto',
+ 'protocol/search_engine_specifics.proto',
+ 'protocol/session_specifics.proto',
+ 'protocol/sync.proto',
+ 'protocol/sync_enums.proto',
+ 'protocol/synced_notification_app_info_specifics.proto',
+ 'protocol/synced_notification_data.proto',
+ 'protocol/synced_notification_render.proto',
+ 'protocol/synced_notification_specifics.proto',
+ 'protocol/test.proto',
+ 'protocol/theme_specifics.proto',
+ 'protocol/typed_url_specifics.proto',
+ 'protocol/unique_position.proto',
+ ],
+ 'variables': {
+ 'enable_wexit_time_desctructors': 1,
+ 'proto_in_dir': './protocol',
+ 'proto_out_dir': 'sync/protocol',
+ 'cc_generator_options': 'dllexport_decl=SYNC_PROTO_EXPORT:',
+ 'cc_include': 'sync/protocol/sync_proto_export.h',
+ },
+ 'includes': [
+ '../build/protoc.gypi'
+ ],
+ },
],
}
diff --git a/sync/sync_api.gypi b/sync/sync_api.gypi
deleted file mode 100644
index 8aaf7c7..0000000
--- a/sync/sync_api.gypi
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'include_dirs': [
- '..',
- ],
- 'defines': [
- 'SYNC_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- 'sources': [
- 'api/attachments/attachment.cc',
- 'api/attachments/attachment.h',
- 'api/attachments/attachment_downloader.cc',
- 'api/attachments/attachment_downloader.h',
- 'api/attachments/attachment_id.cc',
- 'api/attachments/attachment_id.h',
- 'api/attachments/attachment_service.cc',
- 'api/attachments/attachment_service.h',
- 'api/attachments/attachment_service_impl.cc',
- 'api/attachments/attachment_service_impl.h',
- 'api/attachments/attachment_service_proxy.cc',
- 'api/attachments/attachment_service_proxy.h',
- 'api/attachments/attachment_service_proxy_for_test.cc',
- 'api/attachments/attachment_service_proxy_for_test.h',
- 'api/attachments/attachment_store.cc',
- 'api/attachments/attachment_store.h',
- 'api/attachments/attachment_uploader.cc',
- 'api/attachments/attachment_uploader.h',
- 'api/string_ordinal.h',
- 'api/syncable_service.cc',
- 'api/syncable_service.h',
- 'api/sync_data.cc',
- 'api/sync_data.h',
- 'api/sync_change.cc',
- 'api/sync_change.h',
- 'api/sync_change_processor.cc',
- 'api/sync_change_processor.h',
- 'api/sync_error.cc',
- 'api/sync_error.h',
- 'api/sync_error_factory.cc',
- 'api/sync_error_factory.h',
- 'api/sync_merge_result.cc',
- 'api/sync_merge_result.h',
- 'api/time.h',
- ],
-}
diff --git a/sync/sync_core.gypi b/sync/sync_core.gypi
deleted file mode 100644
index cb6f72f..0000000
--- a/sync/sync_core.gypi
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'include_dirs': [
- '..',
- ],
- 'defines': [
- 'SYNC_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
- '../crypto/crypto.gyp:crypto',
- '../google_apis/google_apis.gyp:google_apis',
- '../net/net.gyp:net',
- '../sql/sql.gyp:sql',
- '../url/url.gyp:url_lib',
- ],
- 'conditions': [
- ['OS=="linux" and chromeos==1', {
- # Required by get_session_name.cc on Chrome OS.
- 'dependencies': [
- '../chromeos/chromeos.gyp:chromeos',
- ],
- }],
- ],
- 'sources': [
- 'base/sync_export.h',
- 'engine/all_status.cc',
- 'engine/all_status.h',
- 'engine/apply_control_data_updates.cc',
- 'engine/apply_control_data_updates.h',
- 'engine/backoff_delay_provider.cc',
- 'engine/backoff_delay_provider.h',
- 'engine/commit.cc',
- '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',
- 'engine/commit_util.h',
- 'engine/conflict_resolver.cc',
- 'engine/conflict_resolver.h',
- 'engine/conflict_util.cc',
- 'engine/conflict_util.h',
- 'engine/cryptographer_provider.cc',
- 'engine/cryptographer_provider.h',
- 'engine/directory_commit_contribution.cc',
- 'engine/directory_commit_contribution.h',
- 'engine/directory_commit_contributor.cc',
- 'engine/directory_commit_contributor.h',
- 'engine/directory_cryptographer_provider.cc',
- 'engine/directory_cryptographer_provider.h',
- 'engine/directory_update_handler.cc',
- 'engine/directory_update_handler.h',
- 'engine/entity_tracker.cc',
- 'engine/entity_tracker.h',
- 'engine/get_commit_ids.cc',
- 'engine/get_commit_ids.h',
- 'engine/get_updates_delegate.cc',
- 'engine/get_updates_delegate.h',
- 'engine/get_updates_processor.cc',
- 'engine/get_updates_processor.h',
- 'engine/model_type_entity.cc',
- 'engine/model_type_entity.h',
- 'engine/model_type_sync_proxy.cc',
- 'engine/model_type_sync_proxy.h',
- 'engine/model_type_sync_proxy_impl.cc',
- 'engine/model_type_sync_proxy_impl.h',
- 'engine/model_type_sync_worker.cc',
- 'engine/model_type_sync_worker.h',
- 'engine/model_type_sync_worker_impl.cc',
- 'engine/model_type_sync_worker_impl.h',
- 'engine/net/server_connection_manager.cc',
- 'engine/net/server_connection_manager.h',
- 'engine/net/url_translator.cc',
- 'engine/net/url_translator.h',
- 'engine/non_blocking_type_commit_contribution.cc',
- 'engine/non_blocking_type_commit_contribution.h',
- 'engine/nudge_source.cc',
- 'engine/nudge_source.h',
- 'engine/nudge_handler.cc',
- 'engine/nudge_handler.h',
- 'engine/process_updates_util.cc',
- 'engine/process_updates_util.h',
- 'engine/sync_cycle_event.cc',
- 'engine/sync_cycle_event.h',
- 'engine/sync_engine_event_listener.cc',
- 'engine/sync_engine_event_listener.h',
- 'engine/syncer.cc',
- 'engine/syncer.h',
- 'engine/syncer_proto_util.cc',
- 'engine/syncer_proto_util.h',
- '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',
- 'engine/update_applicator.h',
- 'engine/update_handler.cc',
- 'engine/update_handler.h',
- 'js/js_backend.h',
- 'js/js_controller.h',
- 'js/js_event_details.cc',
- 'js/js_event_details.h',
- 'js/js_event_handler.h',
- 'js/sync_js_controller.cc',
- 'js/sync_js_controller.h',
- 'protocol/proto_enum_conversions.cc',
- 'protocol/proto_enum_conversions.h',
- 'protocol/proto_value_conversions.cc',
- 'protocol/proto_value_conversions.h',
- 'protocol/sync_protocol_error.cc',
- 'protocol/sync_protocol_error.h',
- 'sessions/data_type_tracker.cc',
- 'sessions/data_type_tracker.h',
- 'sessions/debug_info_getter.h',
- 'sessions/directory_type_debug_info_emitter.cc',
- 'sessions/directory_type_debug_info_emitter.h',
- 'sessions/model_type_registry.cc',
- 'sessions/model_type_registry.h',
- 'sessions/nudge_tracker.cc',
- 'sessions/nudge_tracker.h',
- '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',
- 'syncable/blob.h',
- 'syncable/dir_open_result.h',
- 'syncable/directory.cc',
- 'syncable/directory.h',
- 'syncable/directory_backing_store.cc',
- 'syncable/directory_backing_store.h',
- 'syncable/directory_change_delegate.h',
- 'syncable/entry.cc',
- 'syncable/entry.h',
- 'syncable/entry_kernel.cc',
- 'syncable/entry_kernel.h',
- 'syncable/in_memory_directory_backing_store.cc',
- 'syncable/in_memory_directory_backing_store.h',
- 'syncable/invalid_directory_backing_store.cc',
- 'syncable/invalid_directory_backing_store.h',
- 'syncable/metahandle_set.h',
- 'syncable/model_neutral_mutable_entry.cc',
- 'syncable/model_neutral_mutable_entry.h',
- 'syncable/model_type.cc',
- 'syncable/mutable_entry.cc',
- 'syncable/mutable_entry.h',
- 'syncable/nigori_handler.cc',
- 'syncable/nigori_handler.h',
- 'syncable/nigori_util.cc',
- 'syncable/nigori_util.h',
- 'syncable/on_disk_directory_backing_store.cc',
- 'syncable/on_disk_directory_backing_store.h',
- 'syncable/parent_child_index.cc',
- 'syncable/parent_child_index.h',
- 'syncable/scoped_kernel_lock.cc',
- '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',
- 'syncable/syncable_base_write_transaction.h',
- 'syncable/syncable_changes_version.h',
- 'syncable/syncable_columns.h',
- 'syncable/syncable_delete_journal.cc',
- 'syncable/syncable_delete_journal.h',
- 'syncable/syncable_enum_conversions.cc',
- 'syncable/syncable_enum_conversions.h',
- 'syncable/syncable_id.cc',
- 'syncable/syncable_id.h',
- 'syncable/syncable_model_neutral_write_transaction.cc',
- 'syncable/syncable_model_neutral_write_transaction.h',
- 'syncable/syncable_proto_util.cc',
- 'syncable/syncable_proto_util.h',
- 'syncable/syncable_read_transaction.cc',
- 'syncable/syncable_read_transaction.h',
- 'syncable/syncable_util.cc',
- 'syncable/syncable_util.h',
- 'syncable/syncable_write_transaction.cc',
- 'syncable/syncable_write_transaction.h',
- 'syncable/transaction_observer.h',
- 'syncable/write_transaction_info.cc',
- 'syncable/write_transaction_info.h',
- 'util/cryptographer.cc',
- 'util/cryptographer.h',
- 'util/data_type_histogram.h',
- 'util/encryptor.h',
- 'util/extensions_activity.cc',
- 'util/extensions_activity.h',
- 'util/get_session_name.cc',
- 'util/get_session_name.h',
- 'util/get_session_name_ios.h',
- 'util/get_session_name_ios.mm',
- 'util/get_session_name_linux.cc',
- 'util/get_session_name_linux.h',
- 'util/get_session_name_mac.h',
- 'util/get_session_name_mac.mm',
- 'util/get_session_name_win.cc',
- 'util/get_session_name_win.h',
- 'util/logging.cc',
- 'util/logging.h',
- 'util/nigori.cc',
- 'util/nigori.h',
- 'util/time.cc',
- 'util/time.h',
- ],
-}
diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi
deleted file mode 100644
index c714012..0000000
--- a/sync/sync_internal_api.gypi
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'include_dirs': [
- '..',
- ],
- 'defines': [
- 'SYNC_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../net/net.gyp:net',
- '../third_party/zlib/zlib.gyp:zlib',
- '../url/url.gyp:url_lib',
- ],
- 'sources': [
- 'internal_api/attachments/attachment_downloader_impl.cc',
- 'internal_api/attachments/attachment_uploader_impl.cc',
- 'internal_api/attachments/fake_attachment_downloader.cc',
- 'internal_api/attachments/fake_attachment_store.cc',
- 'internal_api/attachments/fake_attachment_uploader.cc',
- 'internal_api/base_node.cc',
- 'internal_api/base_transaction.cc',
- 'internal_api/change_record.cc',
- 'internal_api/change_reorder_buffer.cc',
- 'internal_api/change_reorder_buffer.h',
- 'internal_api/debug_info_event_listener.cc',
- 'internal_api/debug_info_event_listener.h',
- 'internal_api/delete_journal.cc',
- 'internal_api/events/commit_request_event.cc',
- 'internal_api/events/commit_response_event.cc',
- 'internal_api/events/configure_get_updates_request_event.cc',
- 'internal_api/events/get_updates_response_event.cc',
- 'internal_api/events/normal_get_updates_request_event.cc',
- 'internal_api/events/poll_get_updates_request_event.cc',
- 'internal_api/events/protocol_event.cc',
- 'internal_api/http_bridge.cc',
- 'internal_api/http_bridge_network_resources.cc',
- 'internal_api/internal_components_factory_impl.cc',
- 'internal_api/js_mutation_event_observer.cc',
- 'internal_api/js_mutation_event_observer.h',
- 'internal_api/js_sync_encryption_handler_observer.cc',
- 'internal_api/js_sync_encryption_handler_observer.h',
- 'internal_api/js_sync_manager_observer.cc',
- 'internal_api/js_sync_manager_observer.h',
- 'internal_api/protocol_event_buffer.cc',
- 'internal_api/protocol_event_buffer.h',
- 'internal_api/public/attachments/attachment_downloader_impl.h',
- 'internal_api/public/attachments/attachment_uploader_impl.h',
- 'internal_api/public/attachments/fake_attachment_downloader.h',
- 'internal_api/public/attachments/fake_attachment_store.h',
- 'internal_api/public/attachments/fake_attachment_uploader.h',
- 'internal_api/public/base/attachment_id_proto.cc',
- 'internal_api/public/base/attachment_id_proto.h',
- 'internal_api/public/base/cancelation_observer.cc',
- 'internal_api/public/base/cancelation_observer.h',
- 'internal_api/public/base/cancelation_signal.cc',
- 'internal_api/public/base/cancelation_signal.h',
- 'internal_api/public/base/enum_set.h',
- 'internal_api/public/base/enum_set.h',
- '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_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/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',
- 'internal_api/public/data_type_association_stats.h',
- 'internal_api/public/data_type_debug_info_listener.cc',
- 'internal_api/public/data_type_debug_info_listener.h',
- 'internal_api/public/delete_journal.h',
- 'internal_api/public/engine/model_safe_worker.cc',
- 'internal_api/public/engine/model_safe_worker.h',
- 'internal_api/public/engine/passive_model_worker.cc',
- 'internal_api/public/engine/passive_model_worker.h',
- 'internal_api/public/engine/polling_constants.cc',
- 'internal_api/public/engine/polling_constants.h',
- 'internal_api/public/engine/sync_status.cc',
- 'internal_api/public/engine/sync_status.h',
- 'internal_api/public/events/commit_request_event.h',
- 'internal_api/public/events/commit_response_event.h',
- 'internal_api/public/events/configure_get_updates_request_event.h',
- 'internal_api/public/events/get_updates_response_event.h',
- 'internal_api/public/events/normal_get_updates_request_event.h',
- 'internal_api/public/events/poll_get_updates_request_event.h',
- 'internal_api/public/events/protocol_event.h',
- 'internal_api/public/http_bridge.h',
- 'internal_api/public/http_bridge_network_resources.h',
- 'internal_api/public/http_post_provider_factory.h',
- 'internal_api/public/http_post_provider_interface.h',
- 'internal_api/public/internal_components_factory.h',
- 'internal_api/public/internal_components_factory_impl.h',
- 'internal_api/public/network_resources.h',
- 'internal_api/public/non_blocking_sync_common.cc',
- 'internal_api/public/non_blocking_sync_common.h',
- 'internal_api/public/read_node.h',
- 'internal_api/public/read_transaction.h',
- 'internal_api/public/sessions/commit_counters.cc',
- 'internal_api/public/sessions/commit_counters.h',
- 'internal_api/public/sessions/model_neutral_state.cc',
- 'internal_api/public/sessions/model_neutral_state.h',
- 'internal_api/public/sessions/status_counters.cc',
- 'internal_api/public/sessions/status_counters.h',
- 'internal_api/public/sessions/sync_session_snapshot.cc',
- 'internal_api/public/sessions/sync_session_snapshot.h',
- 'internal_api/public/sessions/type_debug_info_observer.cc',
- '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/sync_auth_provider.h',
- 'internal_api/public/sync_context.h',
- 'internal_api/public/sync_context_proxy.h',
- '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.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/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',
- 'internal_api/public/util/weak_handle.cc',
- 'internal_api/public/util/weak_handle.h',
- 'internal_api/public/write_node.h',
- 'internal_api/public/write_transaction.h',
- 'internal_api/read_node.cc',
- 'internal_api/read_transaction.cc',
- 'internal_api/sync_backup_manager.cc',
- 'internal_api/sync_backup_manager.h',
- 'internal_api/sync_context.cc',
- 'internal_api/sync_context_proxy.cc',
- 'internal_api/sync_context_proxy_impl.cc',
- 'internal_api/sync_context_proxy_impl.h',
- 'internal_api/sync_db_util.cc',
- 'internal_api/sync_encryption_handler_impl.cc',
- 'internal_api/sync_encryption_handler_impl.h',
- 'internal_api/sync_manager_factory.cc',
- 'internal_api/sync_manager_impl.cc',
- 'internal_api/sync_manager_impl.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',
- ],
-}
diff --git a/sync/sync_proto.gypi b/sync/sync_proto.gypi
deleted file mode 100644
index fd002bf..0000000
--- a/sync/sync_proto.gypi
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'include_dirs': [
- '..',
- ],
- 'defines': [
- 'SYNC_IMPLEMENTATION',
- ],
- 'sources': [
- # NOTE: If you add a file to this list, also add it to
- # sync/protocol/BUILD.gn
- 'protocol/app_notification_specifics.proto',
- 'protocol/app_setting_specifics.proto',
- 'protocol/app_specifics.proto',
- 'protocol/app_list_specifics.proto',
- 'protocol/article_specifics.proto',
- 'protocol/attachments.proto',
- 'protocol/autofill_specifics.proto',
- 'protocol/bookmark_specifics.proto',
- 'protocol/client_commands.proto',
- 'protocol/client_debug_info.proto',
- 'protocol/device_info_specifics.proto',
- 'protocol/dictionary_specifics.proto',
- 'protocol/encryption.proto',
- 'protocol/experiments_specifics.proto',
- 'protocol/extension_setting_specifics.proto',
- 'protocol/extension_specifics.proto',
- 'protocol/favicon_image_specifics.proto',
- 'protocol/favicon_tracking_specifics.proto',
- 'protocol/get_updates_caller_info.proto',
- 'protocol/history_delete_directive_specifics.proto',
- 'protocol/nigori_specifics.proto',
- 'protocol/managed_user_setting_specifics.proto',
- 'protocol/managed_user_shared_setting_specifics.proto',
- 'protocol/managed_user_specifics.proto',
- 'protocol/password_specifics.proto',
- 'protocol/preference_specifics.proto',
- 'protocol/priority_preference_specifics.proto',
- 'protocol/search_engine_specifics.proto',
- 'protocol/session_specifics.proto',
- 'protocol/sync.proto',
- 'protocol/sync_enums.proto',
- 'protocol/synced_notification_app_info_specifics.proto',
- 'protocol/synced_notification_data.proto',
- 'protocol/synced_notification_render.proto',
- 'protocol/synced_notification_specifics.proto',
- 'protocol/test.proto',
- 'protocol/theme_specifics.proto',
- 'protocol/typed_url_specifics.proto',
- 'protocol/unique_position.proto',
- ],
- 'variables': {
- 'proto_in_dir': './protocol',
- 'proto_out_dir': 'sync/protocol',
- 'cc_generator_options': 'dllexport_decl=SYNC_EXPORT:',
- 'cc_include': 'sync/base/sync_export.h',
- },
- 'includes': [
- '../build/protoc.gypi'
- ],
-}