Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/sync_tests.gypi

Issue 11412211: [sync] Componentize sync: Part Final: Target 'sync' is now its own component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + Merge + Undo copyright changes Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/sync_proto.gypi ('k') | sync/syncable/syncable_base_transaction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sync_tests.gypi
diff --git a/sync/sync.gyp b/sync/sync_tests.gypi
similarity index 53%
copy from sync/sync.gyp
copy to sync/sync_tests.gypi
index 12f5267190a66734e17c5d94a0aae41fdf282775..81424c893410ec892e0d2964552f16ad47787dd4 100644
--- a/sync/sync.gyp
+++ b/sync/sync_tests.gypi
@@ -3,457 +3,7 @@
# found in the LICENSE file.
{
- 'variables': {
- 'chromium_code': 1,
- },
'targets': [
- # The core sync library.
- {
- 'target_name': 'sync_core',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'include_dirs': [
- '..',
- ],
- 'defines': [
- 'SYNC_IMPLEMENTATION',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../crypto/crypto.gyp:crypto',
- '../google_apis/google_apis.gyp:google_apis',
- '../net/net.gyp:net',
- '../sql/sql.gyp:sql',
- 'protocol/sync_proto.gyp:sync_proto',
- ],
- 'conditions': [
- ['OS=="linux" and chromeos==1', {
- # Required by get_session_name.cc on Chrome OS.
- 'dependencies': [
- '../chromeos/chromeos.gyp:chromeos',
- ],
- }],
- ],
- 'export_dependent_settings': [
- # Propagate sync_proto since our headers include its generated
- # files.
- 'protocol/sync_proto.gyp:sync_proto',
- ],
- '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/apply_updates_and_resolve_conflicts_command.cc',
- 'engine/apply_updates_and_resolve_conflicts_command.h',
- 'engine/backoff_delay_provider.cc',
- 'engine/backoff_delay_provider.h',
- 'engine/build_commit_command.cc',
- 'engine/build_commit_command.h',
- 'engine/commit.cc',
- 'engine/commit.h',
- 'engine/conflict_resolver.cc',
- 'engine/conflict_resolver.h',
- 'engine/conflict_util.cc',
- 'engine/conflict_util.h',
- 'engine/download_updates_command.cc',
- 'engine/download_updates_command.h',
- 'engine/get_commit_ids_command.cc',
- 'engine/get_commit_ids_command.h',
- 'engine/model_changing_syncer_command.cc',
- 'engine/model_changing_syncer_command.h',
- 'engine/net/server_connection_manager.cc',
- 'engine/net/server_connection_manager.h',
- 'engine/net/url_translator.cc',
- 'engine/net/url_translator.h',
- 'engine/nudge_source.cc',
- 'engine/nudge_source.h',
- 'engine/process_commit_response_command.cc',
- 'engine/process_commit_response_command.h',
- 'engine/process_updates_command.cc',
- 'engine/process_updates_command.h',
- 'engine/store_timestamps_command.cc',
- 'engine/store_timestamps_command.h',
- 'engine/sync_engine_event.cc',
- 'engine/sync_engine_event.h',
- 'engine/sync_scheduler.cc',
- 'engine/sync_scheduler.h',
- 'engine/sync_scheduler_impl.cc',
- 'engine/sync_scheduler_impl.h',
- 'engine/sync_session_job.cc',
- 'engine/sync_session_job.h',
- 'engine/syncer.cc',
- 'engine/syncer.h',
- 'engine/syncer_command.cc',
- 'engine/syncer_command.h',
- 'engine/syncer_proto_util.cc',
- 'engine/syncer_proto_util.h',
- 'engine/syncer_types.h',
- 'engine/syncer_util.cc',
- 'engine/syncer_util.h',
- 'engine/throttled_data_type_tracker.cc',
- 'engine/throttled_data_type_tracker.h',
- 'engine/traffic_logger.cc',
- 'engine/traffic_logger.h',
- 'engine/traffic_recorder.cc',
- 'engine/traffic_recorder.h',
- 'engine/update_applicator.cc',
- 'engine/update_applicator.h',
- 'js/js_arg_list.cc',
- 'js/js_arg_list.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/js_reply_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/debug_info_getter.h',
- 'sessions/ordered_commit_set.cc',
- 'sessions/ordered_commit_set.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_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/scoped_kernel_lock.h',
- 'syncable/syncable-inl.h',
- 'syncable/syncable_base_transaction.cc',
- 'syncable/syncable_base_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_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',
-
- # TODO(akalin): Figure out a better place to put
- # data_encryption_win*; it's also used by autofill.
- 'util/data_encryption_win.cc',
- 'util/data_encryption_win.h',
-
- 'util/data_type_histogram.h',
- 'util/encryptor.h',
- 'util/extensions_activity_monitor.cc',
- 'util/extensions_activity_monitor.h',
- 'util/get_session_name.cc',
- 'util/get_session_name.h',
- 'util/get_session_name_ios.mm',
- 'util/get_session_name_ios.h',
- 'util/get_session_name_mac.mm',
- 'util/get_session_name_mac.h',
- '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 notifications library.
- {
- 'target_name': 'sync_notifier',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'include_dirs': [
- '..',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../jingle/jingle.gyp:jingle_glue',
- '../jingle/jingle.gyp:notifier',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
- # TODO(akalin): Remove this (http://crbug.com/133352).
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- 'sync_core',
- ],
- 'export_dependent_settings': [
- '../jingle/jingle.gyp:notifier',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
- ],
- 'sources': [
- 'notifier/invalidation_handler.h',
- 'notifier/invalidation_state_tracker.cc',
- 'notifier/invalidation_state_tracker.h',
- 'notifier/invalidation_util.cc',
- 'notifier/invalidation_util.h',
- 'notifier/invalidator_factory.cc',
- 'notifier/invalidator_factory.h',
- 'notifier/invalidator.h',
- 'notifier/invalidator_registrar.cc',
- 'notifier/invalidator_registrar.h',
- 'notifier/invalidator_state.cc',
- 'notifier/invalidator_state.h',
- 'notifier/object_id_invalidation_map.cc',
- 'notifier/object_id_invalidation_map.h',
- ],
- 'conditions': [
- ['OS != "android"', {
- 'sources': [
- 'notifier/ack_tracker.cc',
- 'notifier/ack_tracker.h',
- 'notifier/invalidation_notifier.cc',
- 'notifier/invalidation_notifier.h',
- 'notifier/non_blocking_invalidator.cc',
- 'notifier/non_blocking_invalidator.h',
- 'notifier/p2p_invalidator.cc',
- 'notifier/p2p_invalidator.h',
- 'notifier/push_client_channel.cc',
- 'notifier/push_client_channel.h',
- 'notifier/registration_manager.cc',
- 'notifier/registration_manager.h',
- 'notifier/state_writer.h',
- 'notifier/sync_invalidation_listener.cc',
- 'notifier/sync_invalidation_listener.h',
- 'notifier/sync_system_resources.cc',
- 'notifier/sync_system_resources.h',
- ],
- }],
- ],
- },
- # The sync internal API library.
- {
- 'target_name': 'sync_internal_api',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'include_dirs': [
- '..',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../net/net.gyp:net',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_notifier',
- ],
- 'export_dependent_settings': [
- # Propagate sync_proto since our headers include its generated
- # files.
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- ],
- 'sources': [
- '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/http_bridge.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/public/base/enum_set.h',
- 'internal_api/public/base/invalidation.cc',
- 'internal_api/public/base/invalidation.h',
- 'internal_api/public/base/model_type.h',
- 'internal_api/public/base/model_type_invalidation_map.cc',
- 'internal_api/public/base/model_type_invalidation_map.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.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/http_bridge.h',
- 'internal_api/public/http_post_provider_factory.h',
- 'internal_api/public/http_post_provider_interface.h',
- 'internal_api/public/internal_components_factory_impl.h',
- 'internal_api/public/internal_components_factory.h',
- 'internal_api/public/delete_journal.h',
- 'internal_api/public/read_node.h',
- 'internal_api/public/read_transaction.h',
- 'internal_api/public/sessions/model_neutral_state.cc',
- 'internal_api/public/sessions/model_neutral_state.h',
- 'internal_api/public/sessions/sync_session_snapshot.cc',
- 'internal_api/public/sessions/sync_session_snapshot.h',
- 'internal_api/public/sessions/sync_source_info.cc',
- 'internal_api/public/sessions/sync_source_info.h',
- 'internal_api/public/sync_encryption_handler.cc',
- 'internal_api/public/sync_encryption_handler.h',
- 'internal_api/public/sync_manager_factory.h',
- 'internal_api/public/sync_manager.cc',
- 'internal_api/public/sync_manager.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_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/delete_journal.cc',
- 'internal_api/read_node.cc',
- 'internal_api/read_transaction.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/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',
- ],
- },
-
- # The sync external API library.
- {
- 'target_name': 'sync_api',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'include_dirs': [
- '..',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_internal_api',
- ],
- # We avoid including header files from sync_proto in our public
- # header files so we don't need to export its settings.
- 'sources': [
- 'api/string_ordinal.h',
- 'api/syncable_service.cc',
- 'api/syncable_service.h',
- 'api/sync_data.h',
- 'api/sync_data.cc',
- 'api/sync_change.h',
- 'api/sync_change.cc',
- 'api/sync_change_processor.h',
- 'api/sync_change_processor.cc',
- 'api/sync_error.h',
- 'api/sync_error.cc',
- 'api/sync_error_factory.h',
- 'api/sync_error_factory.cc',
- 'api/sync_merge_result.h',
- 'api/sync_merge_result.cc',
- 'api/time.h',
- ],
- },
-
- # The componentized sync library.
- {
- 'target_name': 'sync_component',
- # TODO(rsimha): Change the type of this target to '<(component)' after
- # exporting dependencies on 'sync_proto'.
- 'type': 'none',
- 'dependencies': [
- 'sync_api',
- 'sync_core',
- 'sync_notifier',
- 'sync_internal_api',
- ],
- 'export_dependent_settings': [
- 'sync_api',
- 'sync_core',
- 'sync_notifier',
- 'sync_internal_api',
- ],
- },
-
- # The public sync target. This depends on 'sync_component' and
- # 'sync_proto' separately since 'sync_proto' isn't exportable from
- # 'sync_component' (for now).
- {
- 'target_name': 'sync',
- 'type': 'none',
- 'dependencies': [
- 'sync_component',
- 'protocol/sync_proto.gyp:sync_proto',
- ],
- 'export_dependent_settings': [
- 'sync_component',
- 'protocol/sync_proto.gyp:sync_proto',
- ],
- },
-
# Test support files for the 'sync_core' target.
{
'target_name': 'test_support_sync_core',
@@ -462,18 +12,19 @@
'include_dirs': [
'..',
],
+ 'defines': [
+ 'SYNC_TEST'
+ ],
'dependencies': [
'../base/base.gyp:base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
+ 'sync',
],
'export_dependent_settings': [
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
+ 'sync',
],
'sources': [
'js/js_test_util.cc',
@@ -527,10 +78,9 @@
'dependencies': [
'../base/base.gyp:base',
'../net/net.gyp:net_test_support',
-
# The sync test server uses Python modules generated by the sync protos.
'../third_party/protobuf/protobuf.gyp:py_proto',
- 'protocol/sync_proto.gyp:sync_proto',
+ 'sync',
],
'export_dependent_settings': [
'../base/base.gyp:base',
@@ -549,17 +99,18 @@
'include_dirs': [
'..',
],
+ 'defines': [
+ 'SYNC_TEST'
+ ],
'dependencies': [
'../testing/gmock.gyp:gmock',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
- 'sync_internal_api',
- 'sync_notifier',
+ 'sync',
],
'export_dependent_settings': [
'../testing/gmock.gyp:gmock',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
- 'sync_internal_api',
- 'sync_notifier',
+ 'sync',
],
'sources': [
'notifier/fake_invalidation_state_tracker.cc',
@@ -583,21 +134,18 @@
'include_dirs': [
'..',
],
+ 'defines': [
+ 'SYNC_TEST'
+ ],
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_internal_api',
- 'sync_notifier',
+ 'sync',
'test_support_sync_core',
],
'export_dependent_settings': [
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_internal_api',
- 'sync_notifier',
+ 'sync',
'test_support_sync_core',
],
'sources': [
@@ -625,13 +173,16 @@
'include_dirs': [
'..',
],
+ 'defines': [
+ 'SYNC_TEST'
+ ],
'dependencies': [
'../testing/gmock.gyp:gmock',
- 'sync_api',
+ 'sync',
],
'export_dependent_settings': [
'../testing/gmock.gyp:gmock',
- 'sync_api',
+ 'sync',
],
'sources': [
'api/fake_syncable_service.cc',
@@ -652,20 +203,28 @@
'suppress_wildcard': 1,
'dependencies': [
'../base/base.gyp:base',
+ '../sql/sql.gyp:sql',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
+ 'sync',
'test_support_sync_core',
],
+ 'conditions': [
+ ['OS=="linux" and chromeos==1', {
+ # Required by get_session_name_unittest.cc on Chrome OS.
+ 'dependencies': [
+ '../chromeos/chromeos.gyp:chromeos',
+ ],
+ }],
+ ],
# Propagate all dependencies since the actual compilation
# happens in the dependents.
'export_dependent_settings': [
'../base/base.gyp:base',
+ '../sql/sql.gyp:sql',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
+ 'sync',
'test_support_sync_core',
],
'direct_dependent_settings': {
@@ -753,8 +312,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
'../third_party/libjingle/libjingle.gyp:libjingle',
- 'sync_core',
- 'sync_notifier',
+ 'sync',
'test_support_sync_notifier',
],
# Propagate all dependencies since the actual compilation
@@ -767,8 +325,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
'../third_party/libjingle/libjingle.gyp:libjingle',
- 'sync_core',
- 'sync_notifier',
+ 'sync',
'test_support_sync_notifier',
],
'direct_dependent_settings': {
@@ -812,10 +369,7 @@
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_internal_api',
- 'sync_notifier',
+ 'sync',
'test_support_sync_internal_api',
],
# Propagate all dependencies since the actual compilation
@@ -826,10 +380,7 @@
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_internal_api',
- 'sync_notifier',
+ 'sync',
'test_support_sync_internal_api',
],
'direct_dependent_settings': {
@@ -871,9 +422,7 @@
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_internal_api',
+ 'sync',
'test_support_sync_internal_api',
],
# Propagate all dependencies since the actual compilation
@@ -881,9 +430,7 @@
'export_dependent_settings': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'protocol/sync_proto.gyp:sync_proto',
- 'sync_core',
- 'sync_internal_api',
+ 'sync',
'test_support_sync_internal_api',
],
'direct_dependent_settings': {
@@ -904,9 +451,11 @@
'type': '<(gtest_target_type)',
# Typed-parametrized tests generate exit-time destructors.
'variables': { 'enable_wexit_time_destructors': 0, },
+ 'defines': [
+ 'SYNC_TEST',
+ ],
'dependencies': [
'../base/base.gyp:run_all_unittests',
- 'sync',
'sync_api_tests',
'sync_core_tests',
'sync_internal_api_tests',
@@ -935,16 +484,19 @@
{
'target_name': 'sync_tools_helper',
'type': 'static_library',
+ 'defines': [
+ 'SYNC_IMPLEMENTATION',
+ ],
'include_dirs': [
'..',
],
'dependencies': [
'../base/base.gyp:base',
- 'sync_notifier',
+ 'sync',
],
'export_dependent_settings': [
'../base/base.gyp:base',
- 'sync_notifier',
+ 'sync',
],
'sources': [
'tools/null_invalidation_state_tracker.cc',
@@ -972,6 +524,9 @@
{
'target_name': 'sync_listen_notifications',
'type': 'executable',
+ 'defines': [
+ 'SYNC_TEST',
+ ],
'dependencies': [
'../base/base.gyp:base',
'../jingle/jingle.gyp:notifier',
@@ -999,6 +554,7 @@
'../net/net.gyp:net_test_support',
'sync',
'sync_tools_helper',
+ 'test_support_sync_core'
],
'sources': [
'tools/sync_client.cc',
« no previous file with comments | « sync/sync_proto.gypi ('k') | sync/syncable/syncable_base_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698