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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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 | « chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d860a13a31915167860b0435b3c678999176b874..28a8298f153f730202843d62267c04f5deaef93e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -261,12 +261,10 @@
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'sources': [
- 'browser/sync/engine/syncapi_internal.cc',
- 'browser/sync/engine/syncapi_internal.h',
- 'browser/sync/internal_api/includes/syncer_error.cc',
- 'browser/sync/internal_api/includes/syncer_error.h',
- 'browser/sync/internal_api/includes/report_unrecoverable_error_function.h',
- 'browser/sync/internal_api/includes/unrecoverable_error_handler.h',
+ 'browser/sync/internal_api/all_status.cc',
+ 'browser/sync/internal_api/all_status.h',
+ 'browser/sync/internal_api/syncapi_internal.cc',
+ 'browser/sync/internal_api/syncapi_internal.h',
'browser/sync/internal_api/base_node.cc',
'browser/sync/internal_api/base_node.h',
'browser/sync/internal_api/base_transaction.cc',
@@ -294,6 +292,10 @@
'browser/sync/internal_api/write_node.h',
'browser/sync/internal_api/write_transaction.cc',
'browser/sync/internal_api/write_transaction.h',
+ 'browser/sync/internal_api/js_mutation_event_observer.cc',
+ 'browser/sync/internal_api/js_mutation_event_observer.h',
+ 'browser/sync/internal_api/js_sync_manager_observer.cc',
+ 'browser/sync/internal_api/js_sync_manager_observer.h',
],
'include_dirs': [
'..',
@@ -307,12 +309,12 @@
'../net/net.gyp:net',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../sync/protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ '../sync/sync.gyp:sync',
'sync_notifier',
],
'export_dependent_settings': [
'../sync/protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ '../sync/sync.gyp:sync',
],
# This target exports a hard dependency because syncapi.h includes
# generated proto header files from sync_proto.
@@ -341,216 +343,18 @@
'dependencies': [
'../base/base.gyp:base',
'../sync/protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ '../sync/sync.gyp:sync',
],
'export_dependent_settings': [
'../base/base.gyp:base',
'../sync/protocol/sync_proto.gyp:sync_proto',
- 'sync',
+ '../sync/sync.gyp:sync',
],
# Even though this target depends on sync_proto, it doesn't
# need to export a hard dependency since we explicitly avoid
# including the generated proto header files from this target's
# header files.
},
- {
- 'target_name': 'sync',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'sources': [
- 'browser/sync/engine/all_status.cc',
- 'browser/sync/engine/all_status.h',
- 'browser/sync/engine/apply_updates_command.cc',
- 'browser/sync/engine/apply_updates_command.h',
- 'browser/sync/engine/build_commit_command.cc',
- 'browser/sync/engine/build_commit_command.h',
- 'browser/sync/engine/cleanup_disabled_types_command.cc',
- 'browser/sync/engine/cleanup_disabled_types_command.h',
- 'browser/sync/engine/clear_data_command.cc',
- 'browser/sync/engine/clear_data_command.h',
- 'browser/sync/engine/conflict_resolver.cc',
- 'browser/sync/engine/conflict_resolver.h',
- 'browser/sync/engine/download_updates_command.cc',
- 'browser/sync/engine/download_updates_command.h',
- 'browser/sync/engine/get_commit_ids_command.cc',
- 'browser/sync/engine/get_commit_ids_command.h',
- 'browser/sync/engine/model_changing_syncer_command.cc',
- 'browser/sync/engine/model_changing_syncer_command.h',
- 'browser/sync/engine/model_safe_worker.cc',
- 'browser/sync/engine/model_safe_worker.h',
- 'browser/sync/engine/passive_model_worker.cc',
- 'browser/sync/engine/passive_model_worker.h',
- 'browser/sync/engine/net/server_connection_manager.cc',
- 'browser/sync/engine/net/server_connection_manager.h',
- 'browser/sync/engine/net/url_translator.cc',
- 'browser/sync/engine/net/url_translator.h',
- 'browser/sync/engine/nigori_util.cc',
- 'browser/sync/engine/nigori_util.h',
- 'browser/sync/engine/nudge_source.cc',
- 'browser/sync/engine/nudge_source.h',
- 'browser/sync/engine/polling_constants.cc',
- 'browser/sync/engine/polling_constants.h',
- 'browser/sync/engine/post_commit_message_command.cc',
- 'browser/sync/engine/post_commit_message_command.h',
- 'browser/sync/engine/process_commit_response_command.cc',
- 'browser/sync/engine/process_commit_response_command.h',
- 'browser/sync/engine/process_updates_command.cc',
- 'browser/sync/engine/process_updates_command.h',
- 'browser/sync/engine/resolve_conflicts_command.cc',
- 'browser/sync/engine/resolve_conflicts_command.h',
- 'browser/sync/engine/store_timestamps_command.cc',
- 'browser/sync/engine/store_timestamps_command.h',
- 'browser/sync/engine/syncer.cc',
- 'browser/sync/engine/syncer.h',
- 'browser/sync/engine/syncer_command.cc',
- 'browser/sync/engine/syncer_command.h',
- 'browser/sync/engine/syncer_proto_util.cc',
- 'browser/sync/engine/syncer_proto_util.h',
- 'browser/sync/engine/sync_scheduler.cc',
- 'browser/sync/engine/sync_scheduler.h',
- 'browser/sync/engine/syncer_types.cc',
- 'browser/sync/engine/syncer_types.h',
- 'browser/sync/engine/syncer_util.cc',
- 'browser/sync/engine/syncer_util.h',
- 'browser/sync/engine/syncproto.h',
- 'browser/sync/engine/update_applicator.cc',
- 'browser/sync/engine/update_applicator.h',
- 'browser/sync/engine/verify_updates_command.cc',
- 'browser/sync/engine/verify_updates_command.h',
- 'browser/sync/js/js_arg_list.cc',
- 'browser/sync/js/js_arg_list.h',
- 'browser/sync/js/js_backend.h',
- 'browser/sync/js/js_controller.h',
- 'browser/sync/js/js_event_details.cc',
- 'browser/sync/js/js_event_details.h',
- 'browser/sync/js/js_event_handler.h',
- 'browser/sync/js/js_reply_handler.h',
- 'browser/sync/js/js_mutation_event_observer.cc',
- 'browser/sync/js/js_mutation_event_observer.h',
- 'browser/sync/js/js_sync_manager_observer.cc',
- 'browser/sync/js/js_sync_manager_observer.h',
- 'browser/sync/protocol/proto_enum_conversions.cc',
- 'browser/sync/protocol/proto_enum_conversions.h',
- 'browser/sync/protocol/proto_value_conversions.cc',
- 'browser/sync/protocol/proto_value_conversions.h',
- 'browser/sync/protocol/service_constants.h',
- 'browser/sync/protocol/sync_protocol_error.cc',
- 'browser/sync/protocol/sync_protocol_error.h',
- 'browser/sync/sessions/debug_info_getter.h',
- 'browser/sync/sessions/ordered_commit_set.cc',
- 'browser/sync/sessions/ordered_commit_set.h',
- 'browser/sync/sessions/session_state.cc',
- 'browser/sync/sessions/session_state.h',
- 'browser/sync/sessions/status_controller.cc',
- 'browser/sync/sessions/status_controller.h',
- 'browser/sync/sessions/sync_session.cc',
- 'browser/sync/sessions/sync_session.h',
- 'browser/sync/sessions/sync_session_context.cc',
- 'browser/sync/sessions/sync_session_context.h',
- 'browser/sync/sync_js_controller.cc',
- 'browser/sync/sync_js_controller.h',
- 'browser/sync/syncable/blob.h',
- 'browser/sync/syncable/directory_backing_store.cc',
- 'browser/sync/syncable/directory_backing_store.h',
- 'browser/sync/syncable/directory_change_delegate.h',
- 'browser/sync/syncable/dir_open_result.h',
- 'browser/sync/syncable/in_memory_directory_backing_store.cc',
- 'browser/sync/syncable/in_memory_directory_backing_store.h',
- 'browser/sync/syncable/model_type.cc',
- 'browser/sync/syncable/model_type.h',
- 'browser/sync/syncable/model_type_payload_map.cc',
- 'browser/sync/syncable/model_type_payload_map.h',
- 'browser/sync/syncable/on_disk_directory_backing_store.cc',
- 'browser/sync/syncable/on_disk_directory_backing_store.h',
- 'browser/sync/syncable/syncable.cc',
- 'browser/sync/syncable/syncable_changes_version.h',
- 'browser/sync/syncable/syncable_columns.h',
- 'browser/sync/syncable/syncable_enum_conversions.cc',
- 'browser/sync/syncable/syncable_enum_conversions.h',
- 'browser/sync/syncable/syncable.h',
- 'browser/sync/syncable/syncable_id.cc',
- 'browser/sync/syncable/syncable_id.h',
- 'browser/sync/syncable/syncable-inl.h',
- 'browser/sync/syncable/transaction_observer.h',
- 'browser/sync/util/cryptographer.cc',
- 'browser/sync/util/cryptographer.h',
- 'browser/sync/util/data_type_histogram.h',
- 'browser/sync/util/encryptor.h',
- 'browser/sync/util/enum_set.h',
- 'browser/sync/util/extensions_activity_monitor.cc',
- 'browser/sync/util/extensions_activity_monitor.h',
- 'browser/sync/util/get_session_name.cc',
- 'browser/sync/util/get_session_name.h',
- 'browser/sync/util/get_session_name_mac.mm',
- 'browser/sync/util/get_session_name_mac.h',
- 'browser/sync/util/get_session_name_win.cc',
- 'browser/sync/util/get_session_name_win.h',
- 'browser/sync/util/immutable.h',
- 'browser/sync/util/logging.cc',
- 'browser/sync/util/logging.h',
- 'browser/sync/util/nigori.cc',
- 'browser/sync/util/nigori.h',
- 'browser/sync/util/time.cc',
- 'browser/sync/util/time.h',
- 'browser/sync/util/unrecoverable_error_info.h',
- 'browser/sync/util/unrecoverable_error_info.cc',
- 'browser/sync/util/weak_handle.cc',
- 'browser/sync/util/weak_handle.h',
- ],
- 'include_dirs': [
- '..',
- ],
- 'defines' : [
- 'SYNC_ENGINE_VERSION_STRING="Unknown"',
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../crypto/crypto.gyp:crypto',
- '../net/net.gyp:net',
- '../sql/sql.gyp:sql',
- '../sync/protocol/sync_proto.gyp:sync_proto',
- ],
- 'export_dependent_settings': [
- '../base/base.gyp:base',
- '../crypto/crypto.gyp:crypto',
- '../sync/protocol/sync_proto.gyp:sync_proto',
- ],
- # This target exports a hard dependency because its header files include
- # protobuf header files from sync_proto.
- 'hard_dependency': 1,
- 'conditions': [
- ['OS=="win"', {
- 'sources' : [
- 'browser/sync/util/data_encryption.cc',
- 'browser/sync/util/data_encryption.h',
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- 'link_settings': {
- 'libraries': [
- '-lXss',
- ],
- },
- }],
- ['OS=="linux" and chromeos==1', {
- 'include_dirs': [
- '<(grit_out_dir)',
- ],
- }],
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
- ],
- },
- }],
- ],
- },
# A library for sending and receiving server-issued notifications.
{
'target_name': 'sync_notifier',
@@ -583,7 +387,7 @@
'..',
],
'dependencies': [
- 'sync',
+ '../sync/sync.gyp:sync',
'../jingle/jingle.gyp:notifier',
'../net/net.gyp:net',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
« no previous file with comments | « chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698