[Sync] Move 'sync' target to sync/

chrome/chrome.gyp

 # Copyright (c) 2012 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.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 243 matching lines @@
         }],
       ],
     },
     {
       # Provides a syncapi dynamic library target from checked-in binaries,
       # or from compiling a stub implementation.
       'target_name': 'syncapi_core',
       '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',
         'browser/sync/internal_api/base_transaction.h',
         'browser/sync/internal_api/change_record.cc',
         'browser/sync/internal_api/change_record.h',
         'browser/sync/internal_api/change_reorder_buffer.cc',
         'browser/sync/internal_api/change_reorder_buffer.h',
         'browser/sync/internal_api/configure_reason.h',
         'browser/sync/internal_api/debug_info_event_listener.cc',
         'browser/sync/internal_api/debug_info_event_listener.h',
         'browser/sync/internal_api/http_post_provider_factory.h',
         'browser/sync/internal_api/http_post_provider_interface.h',
         'browser/sync/internal_api/read_node.cc',
         'browser/sync/internal_api/read_node.h',
         'browser/sync/internal_api/read_transaction.cc',
         'browser/sync/internal_api/read_transaction.h',
         'browser/sync/internal_api/syncapi_server_connection_manager.cc',
         'browser/sync/internal_api/syncapi_server_connection_manager.h',
         'browser/sync/internal_api/sync_manager.cc',
         'browser/sync/internal_api/sync_manager.h',
         'browser/sync/internal_api/user_share.cc',
         'browser/sync/internal_api/user_share.h',
         'browser/sync/internal_api/write_node.cc',
         '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': [
         '..',
       ],
       'defines' : [
         '_CRT_SECURE_NO_WARNINGS',
         '_USE_32BIT_TIME_T',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../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.
       'hard_dependency': 1,
     },
     {
       # Provides the API that Chrome services use to talk to sync.
       'target_name': 'syncapi_service',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'sources': [
         'browser/sync/api/syncable_service.cc',
         'browser/sync/api/syncable_service.h',
         'browser/sync/api/sync_data.h',
         'browser/sync/api/sync_data.cc',
         'browser/sync/api/sync_change.h',
         'browser/sync/api/sync_change.cc',
         'browser/sync/api/sync_change_processor.h',
         'browser/sync/api/sync_change_processor.cc',
         'browser/sync/api/sync_error.h',
         'browser/sync/api/sync_error.cc',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'sources': [
         'browser/sync/notifier/cache_invalidation_packet_handler.cc',
         'browser/sync/notifier/cache_invalidation_packet_handler.h',
         'browser/sync/notifier/chrome_invalidation_client.cc',
         'browser/sync/notifier/chrome_invalidation_client.h',
@@ skipping 12 matching lines @@
         'browser/sync/notifier/registration_manager.h',
         'browser/sync/notifier/state_writer.h',
         'browser/sync/notifier/sync_notifier.h',
         'browser/sync/notifier/sync_notifier_factory.h',
         'browser/sync/notifier/sync_notifier_factory.cc',
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
-        'sync',
+        '../sync/sync.gyp:sync',
         '../jingle/jingle.gyp:notifier',
         '../net/net.gyp:net',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       # This target exports a hard dependency because it depends on
       # cacheinvalidation (which itself has hard_dependency set).
       'hard_dependency': 1,
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
@@ skipping 756 matching lines @@
           'sources': [
             'browser/safe_browsing/signature_util.h',
             'browser/safe_browsing/signature_util_win.cc',
             'tools/safe_browsing/sb_sigutil.cc',
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
   ],  # 'conditions'
 }