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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 337034: Remove the browser_sync flag. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/views/toolbar_view.cc ('k') | chrome/test/live_sync/bookmark_model_verifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 30247)
+++ chrome/chrome.gyp (working copy)
@@ -127,7 +127,6 @@
'../views/controls/table/table_view_unittest.cc',
'../views/grid_layout_unittest.cc',
],
- 'browser_sync%': 1,
'conditions': [
['OS=="win"', {
'nacl_defines': [
@@ -205,11 +204,6 @@
['OS=="linux" and toolkit_views==1', {'sources/': [
['include', '_views\\.cc$'],
]}],
- ['browser_sync==0', {'sources/': [
- ['exclude', '^(browser/sync|browser/views/sync).*cc$'],
- ]}, {'defines': [
- 'BROWSER_SYNC=1',
- ]}],
],
},
'targets': [
@@ -2992,7 +2986,7 @@
'../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
],
}],
- ['OS=="linux" and browser_sync==1', {
+ ['OS=="linux"', {
'sources': [
'browser/gtk/sync_setup_wizard_gtk.cc',
'browser/gtk/sync_setup_wizard_gtk.h',
@@ -4919,39 +4913,30 @@
# Provides a syncapi dynamic library target from checked-in binaries,
# or from compiling a stub implementation.
'target_name': 'syncapi',
-
- 'conditions': [
- ['browser_sync==0', {
- # Empty target.
- 'type': 'none',
- }, {
- # Build sync.
- 'type': '<(library)',
- 'sources': [
- 'browser/sync/engine/syncapi.cc',
- ],
- 'include_dirs': [
- '..',
- '<(protoc_out_dir)',
- ],
- 'defines' : [
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../net/net.gyp:net_base',
- '../third_party/icu/icu.gyp:icuuc',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- 'common_constants',
- 'notifier',
- 'sync',
- 'sync_proto',
- ],
- }],
+ 'type': '<(library)',
+ 'sources': [
+ 'browser/sync/engine/syncapi.cc',
],
+ 'include_dirs': [
+ '..',
+ '<(protoc_out_dir)',
+ ],
+ 'defines' : [
+ '_CRT_SECURE_NO_WARNINGS',
+ '_USE_32BIT_TIME_T',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../net/net.gyp:net_base',
+ '../third_party/icu/icu.gyp:icuuc',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ 'common_constants',
+ 'notifier',
+ 'sync',
+ 'sync_proto',
+ ],
},
{
'target_name': 'page_cycler_tests',
@@ -5084,6 +5069,386 @@
}], # OS="win"
], # conditions
},
+ {
+ # Protobuf compiler / generate rule for sync.proto
+ 'target_name': 'sync_proto',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'compiling sync.proto',
+ 'inputs': [
+ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+ 'browser/sync/protocol/sync.proto',
+ ],
+ 'outputs': [
+ '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
+ '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
+ ],
+ 'action': [
+ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+ '--proto_path=browser/sync/protocol',
+ 'browser/sync/protocol/sync.proto',
+ '--cpp_out=<(protoc_out_dir)/chrome/browser/sync/protocol',
+ ],
+ },
+ ],
+ 'dependencies': [
+ '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+ '../third_party/protobuf2/protobuf.gyp:protoc',
+ ],
+ 'export_dependent_settings': [
+ '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+ ],
+ },
+ {
+ 'target_name': 'notifier',
+ 'type': '<(library)',
+ 'sources': [
+ 'browser/sync/notifier/base/async_dns_lookup.cc',
+ 'browser/sync/notifier/base/async_dns_lookup.h',
+ 'browser/sync/notifier/base/async_network_alive.h',
+ 'browser/sync/notifier/base/fastalloc.h',
+ 'browser/sync/notifier/base/linux/network_status_detector_task_linux.cc',
+ 'browser/sync/notifier/base/linux/time_linux.cc',
+ 'browser/sync/notifier/base/mac/network_status_detector_task_mac.cc',
+ 'browser/sync/notifier/base/mac/time_mac.cc',
+ 'browser/sync/notifier/base/nethelpers.cc',
+ 'browser/sync/notifier/base/nethelpers.h',
+ 'browser/sync/notifier/base/network_status_detector_task.cc',
+ 'browser/sync/notifier/base/network_status_detector_task.h',
+ 'browser/sync/notifier/base/network_status_detector_task_mt.cc',
+ 'browser/sync/notifier/base/network_status_detector_task_mt.h',
+ 'browser/sync/notifier/base/posix/time_posix.cc',
+ 'browser/sync/notifier/base/signal_thread_task.h',
+ 'browser/sync/notifier/base/static_assert.h',
+ 'browser/sync/notifier/base/task_pump.cc',
+ 'browser/sync/notifier/base/task_pump.h',
+ 'browser/sync/notifier/base/time.cc',
+ 'browser/sync/notifier/base/time.h',
+ 'browser/sync/notifier/base/timer.cc',
+ 'browser/sync/notifier/base/timer.h',
+ 'browser/sync/notifier/base/utils.h',
+ 'browser/sync/notifier/base/win/async_network_alive_win32.cc',
+ 'browser/sync/notifier/base/win/time_win32.cc',
+ 'browser/sync/notifier/communicator/auth_task.cc',
+ 'browser/sync/notifier/communicator/auth_task.h',
+ 'browser/sync/notifier/communicator/auto_reconnect.cc',
+ 'browser/sync/notifier/communicator/auto_reconnect.h',
+ 'browser/sync/notifier/communicator/connection_options.cc',
+ 'browser/sync/notifier/communicator/connection_options.h',
+ 'browser/sync/notifier/communicator/connection_settings.cc',
+ 'browser/sync/notifier/communicator/connection_settings.h',
+ 'browser/sync/notifier/communicator/const_communicator.h',
+ 'browser/sync/notifier/communicator/login.cc',
+ 'browser/sync/notifier/communicator/login.h',
+ 'browser/sync/notifier/communicator/login_failure.cc',
+ 'browser/sync/notifier/communicator/login_failure.h',
+ 'browser/sync/notifier/communicator/login_settings.cc',
+ 'browser/sync/notifier/communicator/login_settings.h',
+ 'browser/sync/notifier/communicator/product_info.cc',
+ 'browser/sync/notifier/communicator/product_info.h',
+ 'browser/sync/notifier/communicator/single_login_attempt.cc',
+ 'browser/sync/notifier/communicator/single_login_attempt.h',
+ 'browser/sync/notifier/communicator/ssl_socket_adapter.cc',
+ 'browser/sync/notifier/communicator/ssl_socket_adapter.h',
+ 'browser/sync/notifier/communicator/talk_auth_task.cc',
+ 'browser/sync/notifier/communicator/talk_auth_task.h',
+ 'browser/sync/notifier/communicator/xmpp_connection_generator.cc',
+ 'browser/sync/notifier/communicator/xmpp_connection_generator.h',
+ 'browser/sync/notifier/communicator/xmpp_log.cc',
+ 'browser/sync/notifier/communicator/xmpp_log.h',
+ 'browser/sync/notifier/communicator/xmpp_socket_adapter.cc',
+ 'browser/sync/notifier/communicator/xmpp_socket_adapter.h',
+ 'browser/sync/notifier/gaia_auth/gaiaauth.cc',
+ 'browser/sync/notifier/gaia_auth/gaiaauth.h',
+ 'browser/sync/notifier/gaia_auth/gaiahelper.cc',
+ 'browser/sync/notifier/gaia_auth/gaiahelper.h',
+ 'browser/sync/notifier/gaia_auth/inet_aton.h',
+ 'browser/sync/notifier/gaia_auth/sigslotrepeater.h',
+ 'browser/sync/notifier/gaia_auth/win/win32window.cc',
+ 'browser/sync/notifier/listener/listen_task.cc',
+ 'browser/sync/notifier/listener/listen_task.h',
+ 'browser/sync/notifier/listener/mediator_thread.h',
+ 'browser/sync/notifier/listener/mediator_thread_impl.cc',
+ 'browser/sync/notifier/listener/mediator_thread_impl.h',
+ 'browser/sync/notifier/listener/mediator_thread_mock.h',
+ 'browser/sync/notifier/listener/send_update_task.cc',
+ 'browser/sync/notifier/listener/send_update_task.h',
+ 'browser/sync/notifier/listener/subscribe_task.cc',
+ 'browser/sync/notifier/listener/subscribe_task.h',
+ 'browser/sync/notifier/listener/talk_mediator.h',
+ 'browser/sync/notifier/listener/talk_mediator_impl.cc',
+ 'browser/sync/notifier/listener/talk_mediator_impl.h',
+ ],
+ 'include_dirs': [
+ '..',
+ '<(protoc_out_dir)',
+ ],
+ 'defines' : [
+ '_CRT_SECURE_NO_WARNINGS',
+ '_USE_32BIT_TIME_T',
+ 'kXmppProductName="chromium-sync"',
+ ],
+ 'dependencies': [
+ '../third_party/expat/expat.gyp:expat',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ 'sync_proto',
+ ],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'defines': [
+ 'POSIX',
+ 'OS_LINUX',
+ ],
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk'
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'sync_unit_tests',
+ 'type': 'executable',
+ 'sources': [
+ 'browser/sync/engine/all_status_unittest.cc',
+ 'browser/sync/engine/apply_updates_command_unittest.cc',
+ 'browser/sync/engine/auth_watcher_unittest.cc',
+ 'browser/sync/engine/net/gaia_authenticator_unittest.cc',
+ 'browser/sync/engine/syncer_proto_util_unittest.cc',
+ 'browser/sync/engine/syncer_thread_unittest.cc',
+ 'browser/sync/engine/syncer_unittest.cc',
+ 'browser/sync/engine/syncproto_unittest.cc',
+ 'browser/sync/notifier/listener/talk_mediator_unittest.cc',
+ 'browser/sync/syncable/syncable_id_unittest.cc',
+ 'browser/sync/syncable/syncable_unittest.cc',
+ 'browser/sync/util/character_set_converters_unittest.cc',
+ 'browser/sync/util/crypto_helpers_unittest.cc',
+ 'browser/sync/util/event_sys_unittest.cc',
+ 'browser/sync/util/highres_timer_unittest.cc',
+ 'browser/sync/util/path_helpers_unittest.cc',
+ 'browser/sync/util/query_helpers_unittest.cc',
+ 'browser/sync/util/user_settings_unittest.cc',
+ 'test/sync/engine/mock_gaia_authenticator.cc',
+ 'test/sync/engine/mock_gaia_authenticator.h',
+ 'test/sync/engine/mock_gaia_authenticator_unittest.cc',
+ 'test/sync/engine/mock_server_connection.cc',
+ 'test/sync/engine/mock_server_connection.h',
+ 'test/sync/engine/test_directory_setter_upper.cc',
+ 'test/sync/engine/test_directory_setter_upper.h',
+ 'test/sync/engine/test_id_factory.h',
+ ],
+ 'include_dirs': [
+ '..',
+ '<(protoc_out_dir)',
+ ],
+ 'defines' : [
+ 'SYNC_ENGINE_VERSION_STRING="Unknown"',
+ '_CRT_SECURE_NO_WARNINGS',
+ '_USE_32BIT_TIME_T',
+ ],
+ 'dependencies': [
+ '../testing/gtest.gyp:gtest',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ 'notifier',
+ 'sync',
+ 'sync_proto',
+ 'test_support_unit',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'sources' : [
+ 'browser/sync/util/data_encryption_unittest.cc',
+ ],
+ 'dependencies': [
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lcrypt32.lib',
+ '-lws2_32.lib',
+ '-lsecur32.lib',
+ ],
+ },
+ }, { # else: OS != "win"
+ 'sources!': [
+ 'browser/sync/util/data_encryption_unittest.cc',
+ ],
+ }],
+ ['OS=="linux"', {
+ 'defines': [
+ 'POSIX',
+ ],
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk'
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'sync',
+ 'type': '<(library)',
+ 'sources': [
+ '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
+ '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
+ '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/auth_watcher.cc',
+ 'browser/sync/engine/auth_watcher.h',
+ 'browser/sync/engine/authenticator.cc',
+ 'browser/sync/engine/authenticator.h',
+ 'browser/sync/engine/build_and_process_conflict_sets_command.cc',
+ 'browser/sync/engine/build_and_process_conflict_sets_command.h',
+ 'browser/sync/engine/build_commit_command.cc',
+ 'browser/sync/engine/build_commit_command.h',
+ 'browser/sync/engine/change_reorder_buffer.cc',
+ 'browser/sync/engine/change_reorder_buffer.h',
+ 'browser/sync/engine/client_command_channel.h',
+ 'browser/sync/engine/conflict_resolution_view.cc',
+ 'browser/sync/engine/conflict_resolution_view.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.h',
+ 'browser/sync/engine/net/gaia_authenticator.cc',
+ 'browser/sync/engine/net/gaia_authenticator.h',
+ 'browser/sync/engine/net/http_return.h',
+ 'browser/sync/engine/net/server_connection_manager.cc',
+ 'browser/sync/engine/net/server_connection_manager.h',
+ 'browser/sync/engine/net/syncapi_server_connection_manager.cc',
+ 'browser/sync/engine/net/syncapi_server_connection_manager.h',
+ 'browser/sync/engine/net/url_translator.cc',
+ 'browser/sync/engine/net/url_translator.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/sync_cycle_state.h',
+ 'browser/sync/engine/sync_process_state.cc',
+ 'browser/sync/engine/sync_process_state.h',
+ 'browser/sync/engine/syncapi.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_end_command.cc',
+ 'browser/sync/engine/syncer_end_command.h',
+ 'browser/sync/engine/syncer_proto_util.cc',
+ 'browser/sync/engine/syncer_proto_util.h',
+ 'browser/sync/engine/syncer_session.h',
+ 'browser/sync/engine/syncer_status.cc',
+ 'browser/sync/engine/syncer_status.h',
+ 'browser/sync/engine/syncer_thread.cc',
+ 'browser/sync/engine/syncer_thread.h',
+ 'browser/sync/engine/syncer_thread_timed_stop.cc',
+ 'browser/sync/engine/syncer_thread_timed_stop.h',
+ '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/protocol/service_constants.h',
+ 'browser/sync/syncable/blob.h',
+ 'browser/sync/syncable/dir_open_result.h',
+ 'browser/sync/syncable/directory_backing_store.cc',
+ 'browser/sync/syncable/directory_backing_store.h',
+ 'browser/sync/syncable/directory_event.h',
+ 'browser/sync/syncable/directory_manager.cc',
+ 'browser/sync/syncable/directory_manager.h',
+ 'browser/sync/syncable/path_name_cmp.h',
+ 'browser/sync/syncable/syncable-inl.h',
+ 'browser/sync/syncable/syncable.cc',
+ 'browser/sync/syncable/syncable.h',
+ 'browser/sync/syncable/syncable_changes_version.h',
+ 'browser/sync/syncable/syncable_columns.h',
+ 'browser/sync/syncable/syncable_id.cc',
+ 'browser/sync/syncable/syncable_id.h',
+ 'browser/sync/util/character_set_converters.cc',
+ 'browser/sync/util/character_set_converters.h',
+ 'browser/sync/util/character_set_converters_posix.cc',
+ 'browser/sync/util/character_set_converters_win.cc',
+ 'browser/sync/util/closure.h',
+ 'browser/sync/util/compat_file.h',
+ 'browser/sync/util/compat_file_posix.cc',
+ 'browser/sync/util/compat_file_win.cc',
+ 'browser/sync/util/crypto_helpers.cc',
+ 'browser/sync/util/crypto_helpers.h',
+ 'browser/sync/util/dbgq.h',
+ 'browser/sync/util/event_sys-inl.h',
+ 'browser/sync/util/event_sys.h',
+ 'browser/sync/util/fast_dump.h',
+ 'browser/sync/util/highres_timer.h',
+ 'browser/sync/util/highres_timer_linux.cc',
+ 'browser/sync/util/highres_timer_linux.h',
+ 'browser/sync/util/highres_timer_mac.cc',
+ 'browser/sync/util/highres_timer_mac.h',
+ 'browser/sync/util/highres_timer_win.cc',
+ 'browser/sync/util/highres_timer_win.h',
+ 'browser/sync/util/path_helpers.h',
+ 'browser/sync/util/path_helpers_linux.cc',
+ 'browser/sync/util/path_helpers_mac.cc',
+ 'browser/sync/util/path_helpers_posix.cc',
+ 'browser/sync/util/query_helpers.cc',
+ 'browser/sync/util/query_helpers.h',
+ 'browser/sync/util/row_iterator.h',
+ 'browser/sync/util/signin.h',
+ 'browser/sync/util/sync_types.h',
+ 'browser/sync/util/user_settings.cc',
+ 'browser/sync/util/user_settings.h',
+ 'browser/sync/util/user_settings_posix.cc',
+ 'browser/sync/util/user_settings_win.cc',
+ ],
+ 'include_dirs': [
+ '..',
+ '<(protoc_out_dir)',
+ ],
+ 'defines' : [
+ 'SYNC_ENGINE_VERSION_STRING="Unknown"',
+ '_CRT_SECURE_NO_WARNINGS',
+ '_USE_32BIT_TIME_T',
+ ],
+ 'dependencies': [
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ 'sync_proto',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'sources' : [
+ 'browser/sync/util/data_encryption.cc',
+ 'browser/sync/util/data_encryption.h',
+ 'browser/sync/util/path_helpers.cc',
+ ],
+ }],
+ ['OS=="linux"', {
+ 'defines': [
+ 'POSIX',
+ ],
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk'
+ ],
+ }],
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
+ ],
+ },
+ }],
+ ],
+ },
],
'conditions': [
['OS=="mac" or OS=="win"', {
@@ -6579,391 +6944,6 @@
},
]
}],
- ['browser_sync==1', {
- # These targets get built only where sync is supported.
- 'targets': [
- {
- # Protobuf compiler / generate rule for sync.proto
- 'target_name': 'sync_proto',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'compiling sync.proto',
- 'inputs': [
- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
- 'browser/sync/protocol/sync.proto',
- ],
- 'outputs': [
- '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
- '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
- ],
- 'action': [
- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
- '--proto_path=browser/sync/protocol',
- 'browser/sync/protocol/sync.proto',
- '--cpp_out=<(protoc_out_dir)/chrome/browser/sync/protocol',
- ],
- },
- ],
- 'dependencies': [
- '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
- '../third_party/protobuf2/protobuf.gyp:protoc',
- ],
- 'export_dependent_settings': [
- '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
- ],
- },
- {
- 'target_name': 'notifier',
- 'type': '<(library)',
- 'sources': [
- 'browser/sync/notifier/base/async_dns_lookup.cc',
- 'browser/sync/notifier/base/async_dns_lookup.h',
- 'browser/sync/notifier/base/async_network_alive.h',
- 'browser/sync/notifier/base/fastalloc.h',
- 'browser/sync/notifier/base/linux/network_status_detector_task_linux.cc',
- 'browser/sync/notifier/base/linux/time_linux.cc',
- 'browser/sync/notifier/base/mac/network_status_detector_task_mac.cc',
- 'browser/sync/notifier/base/mac/time_mac.cc',
- 'browser/sync/notifier/base/nethelpers.cc',
- 'browser/sync/notifier/base/nethelpers.h',
- 'browser/sync/notifier/base/network_status_detector_task.cc',
- 'browser/sync/notifier/base/network_status_detector_task.h',
- 'browser/sync/notifier/base/network_status_detector_task_mt.cc',
- 'browser/sync/notifier/base/network_status_detector_task_mt.h',
- 'browser/sync/notifier/base/posix/time_posix.cc',
- 'browser/sync/notifier/base/signal_thread_task.h',
- 'browser/sync/notifier/base/static_assert.h',
- 'browser/sync/notifier/base/task_pump.cc',
- 'browser/sync/notifier/base/task_pump.h',
- 'browser/sync/notifier/base/time.cc',
- 'browser/sync/notifier/base/time.h',
- 'browser/sync/notifier/base/timer.cc',
- 'browser/sync/notifier/base/timer.h',
- 'browser/sync/notifier/base/utils.h',
- 'browser/sync/notifier/base/win/async_network_alive_win32.cc',
- 'browser/sync/notifier/base/win/time_win32.cc',
- 'browser/sync/notifier/communicator/auth_task.cc',
- 'browser/sync/notifier/communicator/auth_task.h',
- 'browser/sync/notifier/communicator/auto_reconnect.cc',
- 'browser/sync/notifier/communicator/auto_reconnect.h',
- 'browser/sync/notifier/communicator/connection_options.cc',
- 'browser/sync/notifier/communicator/connection_options.h',
- 'browser/sync/notifier/communicator/connection_settings.cc',
- 'browser/sync/notifier/communicator/connection_settings.h',
- 'browser/sync/notifier/communicator/const_communicator.h',
- 'browser/sync/notifier/communicator/login.cc',
- 'browser/sync/notifier/communicator/login.h',
- 'browser/sync/notifier/communicator/login_failure.cc',
- 'browser/sync/notifier/communicator/login_failure.h',
- 'browser/sync/notifier/communicator/login_settings.cc',
- 'browser/sync/notifier/communicator/login_settings.h',
- 'browser/sync/notifier/communicator/product_info.cc',
- 'browser/sync/notifier/communicator/product_info.h',
- 'browser/sync/notifier/communicator/single_login_attempt.cc',
- 'browser/sync/notifier/communicator/single_login_attempt.h',
- 'browser/sync/notifier/communicator/ssl_socket_adapter.cc',
- 'browser/sync/notifier/communicator/ssl_socket_adapter.h',
- 'browser/sync/notifier/communicator/talk_auth_task.cc',
- 'browser/sync/notifier/communicator/talk_auth_task.h',
- 'browser/sync/notifier/communicator/xmpp_connection_generator.cc',
- 'browser/sync/notifier/communicator/xmpp_connection_generator.h',
- 'browser/sync/notifier/communicator/xmpp_log.cc',
- 'browser/sync/notifier/communicator/xmpp_log.h',
- 'browser/sync/notifier/communicator/xmpp_socket_adapter.cc',
- 'browser/sync/notifier/communicator/xmpp_socket_adapter.h',
- 'browser/sync/notifier/gaia_auth/gaiaauth.cc',
- 'browser/sync/notifier/gaia_auth/gaiaauth.h',
- 'browser/sync/notifier/gaia_auth/gaiahelper.cc',
- 'browser/sync/notifier/gaia_auth/gaiahelper.h',
- 'browser/sync/notifier/gaia_auth/inet_aton.h',
- 'browser/sync/notifier/gaia_auth/sigslotrepeater.h',
- 'browser/sync/notifier/gaia_auth/win/win32window.cc',
- 'browser/sync/notifier/listener/listen_task.cc',
- 'browser/sync/notifier/listener/listen_task.h',
- 'browser/sync/notifier/listener/mediator_thread.h',
- 'browser/sync/notifier/listener/mediator_thread_impl.cc',
- 'browser/sync/notifier/listener/mediator_thread_impl.h',
- 'browser/sync/notifier/listener/mediator_thread_mock.h',
- 'browser/sync/notifier/listener/send_update_task.cc',
- 'browser/sync/notifier/listener/send_update_task.h',
- 'browser/sync/notifier/listener/subscribe_task.cc',
- 'browser/sync/notifier/listener/subscribe_task.h',
- 'browser/sync/notifier/listener/talk_mediator.h',
- 'browser/sync/notifier/listener/talk_mediator_impl.cc',
- 'browser/sync/notifier/listener/talk_mediator_impl.h',
- ],
- 'include_dirs': [
- '..',
- '<(protoc_out_dir)',
- ],
- 'defines' : [
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
- 'kXmppProductName="chromium-sync"',
- ],
- 'dependencies': [
- '../third_party/expat/expat.gyp:expat',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- 'sync_proto',
- ],
- 'conditions': [
- ['OS=="linux"', {
- 'defines': [
- 'POSIX',
- 'OS_LINUX',
- ],
- 'dependencies': [
- '../build/linux/system.gyp:gtk'
- ],
- }],
- ],
- },
- {
- 'target_name': 'sync_unit_tests',
- 'type': 'executable',
- 'sources': [
- 'browser/sync/engine/all_status_unittest.cc',
- 'browser/sync/engine/apply_updates_command_unittest.cc',
- 'browser/sync/engine/auth_watcher_unittest.cc',
- 'browser/sync/engine/net/gaia_authenticator_unittest.cc',
- 'browser/sync/engine/syncer_proto_util_unittest.cc',
- 'browser/sync/engine/syncer_thread_unittest.cc',
- 'browser/sync/engine/syncer_unittest.cc',
- 'browser/sync/engine/syncproto_unittest.cc',
- 'browser/sync/notifier/listener/talk_mediator_unittest.cc',
- 'browser/sync/syncable/syncable_id_unittest.cc',
- 'browser/sync/syncable/syncable_unittest.cc',
- 'browser/sync/util/character_set_converters_unittest.cc',
- 'browser/sync/util/crypto_helpers_unittest.cc',
- 'browser/sync/util/event_sys_unittest.cc',
- 'browser/sync/util/highres_timer_unittest.cc',
- 'browser/sync/util/path_helpers_unittest.cc',
- 'browser/sync/util/query_helpers_unittest.cc',
- 'browser/sync/util/user_settings_unittest.cc',
- 'test/sync/engine/mock_gaia_authenticator.cc',
- 'test/sync/engine/mock_gaia_authenticator.h',
- 'test/sync/engine/mock_gaia_authenticator_unittest.cc',
- 'test/sync/engine/mock_server_connection.cc',
- 'test/sync/engine/mock_server_connection.h',
- 'test/sync/engine/test_directory_setter_upper.cc',
- 'test/sync/engine/test_directory_setter_upper.h',
- 'test/sync/engine/test_id_factory.h',
- ],
- 'include_dirs': [
- '..',
- '<(protoc_out_dir)',
- ],
- 'defines' : [
- 'SYNC_ENGINE_VERSION_STRING="Unknown"',
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
- ],
- 'dependencies': [
- '../testing/gtest.gyp:gtest',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- 'notifier',
- 'sync',
- 'sync_proto',
- 'test_support_unit',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'sources' : [
- 'browser/sync/util/data_encryption_unittest.cc',
- ],
- 'dependencies': [
- '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
- ],
- 'link_settings': {
- 'libraries': [
- '-lcrypt32.lib',
- '-lws2_32.lib',
- '-lsecur32.lib',
- ],
- },
- }, { # else: OS != "win"
- 'sources!': [
- 'browser/sync/util/data_encryption_unittest.cc',
- ],
- }],
- ['OS=="linux"', {
- 'defines': [
- 'POSIX',
- ],
- 'dependencies': [
- '../build/linux/system.gyp:gtk'
- ],
- }],
- ],
- },
- {
- 'target_name': 'sync',
- 'type': '<(library)',
- 'sources': [
- '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
- '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
- '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/auth_watcher.cc',
- 'browser/sync/engine/auth_watcher.h',
- 'browser/sync/engine/authenticator.cc',
- 'browser/sync/engine/authenticator.h',
- 'browser/sync/engine/build_and_process_conflict_sets_command.cc',
- 'browser/sync/engine/build_and_process_conflict_sets_command.h',
- 'browser/sync/engine/build_commit_command.cc',
- 'browser/sync/engine/build_commit_command.h',
- 'browser/sync/engine/change_reorder_buffer.cc',
- 'browser/sync/engine/change_reorder_buffer.h',
- 'browser/sync/engine/client_command_channel.h',
- 'browser/sync/engine/conflict_resolution_view.cc',
- 'browser/sync/engine/conflict_resolution_view.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.h',
- 'browser/sync/engine/net/gaia_authenticator.cc',
- 'browser/sync/engine/net/gaia_authenticator.h',
- 'browser/sync/engine/net/http_return.h',
- 'browser/sync/engine/net/server_connection_manager.cc',
- 'browser/sync/engine/net/server_connection_manager.h',
- 'browser/sync/engine/net/syncapi_server_connection_manager.cc',
- 'browser/sync/engine/net/syncapi_server_connection_manager.h',
- 'browser/sync/engine/net/url_translator.cc',
- 'browser/sync/engine/net/url_translator.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/sync_cycle_state.h',
- 'browser/sync/engine/sync_process_state.cc',
- 'browser/sync/engine/sync_process_state.h',
- 'browser/sync/engine/syncapi.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_end_command.cc',
- 'browser/sync/engine/syncer_end_command.h',
- 'browser/sync/engine/syncer_proto_util.cc',
- 'browser/sync/engine/syncer_proto_util.h',
- 'browser/sync/engine/syncer_session.h',
- 'browser/sync/engine/syncer_status.cc',
- 'browser/sync/engine/syncer_status.h',
- 'browser/sync/engine/syncer_thread.cc',
- 'browser/sync/engine/syncer_thread.h',
- 'browser/sync/engine/syncer_thread_timed_stop.cc',
- 'browser/sync/engine/syncer_thread_timed_stop.h',
- '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/protocol/service_constants.h',
- 'browser/sync/syncable/blob.h',
- 'browser/sync/syncable/dir_open_result.h',
- 'browser/sync/syncable/directory_backing_store.cc',
- 'browser/sync/syncable/directory_backing_store.h',
- 'browser/sync/syncable/directory_event.h',
- 'browser/sync/syncable/directory_manager.cc',
- 'browser/sync/syncable/directory_manager.h',
- 'browser/sync/syncable/path_name_cmp.h',
- 'browser/sync/syncable/syncable-inl.h',
- 'browser/sync/syncable/syncable.cc',
- 'browser/sync/syncable/syncable.h',
- 'browser/sync/syncable/syncable_changes_version.h',
- 'browser/sync/syncable/syncable_columns.h',
- 'browser/sync/syncable/syncable_id.cc',
- 'browser/sync/syncable/syncable_id.h',
- 'browser/sync/util/character_set_converters.cc',
- 'browser/sync/util/character_set_converters.h',
- 'browser/sync/util/character_set_converters_posix.cc',
- 'browser/sync/util/character_set_converters_win.cc',
- 'browser/sync/util/closure.h',
- 'browser/sync/util/compat_file.h',
- 'browser/sync/util/compat_file_posix.cc',
- 'browser/sync/util/compat_file_win.cc',
- 'browser/sync/util/crypto_helpers.cc',
- 'browser/sync/util/crypto_helpers.h',
- 'browser/sync/util/dbgq.h',
- 'browser/sync/util/event_sys-inl.h',
- 'browser/sync/util/event_sys.h',
- 'browser/sync/util/fast_dump.h',
- 'browser/sync/util/highres_timer.h',
- 'browser/sync/util/highres_timer_linux.cc',
- 'browser/sync/util/highres_timer_linux.h',
- 'browser/sync/util/highres_timer_mac.cc',
- 'browser/sync/util/highres_timer_mac.h',
- 'browser/sync/util/highres_timer_win.cc',
- 'browser/sync/util/highres_timer_win.h',
- 'browser/sync/util/path_helpers.h',
- 'browser/sync/util/path_helpers_linux.cc',
- 'browser/sync/util/path_helpers_mac.cc',
- 'browser/sync/util/path_helpers_posix.cc',
- 'browser/sync/util/query_helpers.cc',
- 'browser/sync/util/query_helpers.h',
- 'browser/sync/util/row_iterator.h',
- 'browser/sync/util/signin.h',
- 'browser/sync/util/sync_types.h',
- 'browser/sync/util/user_settings.cc',
- 'browser/sync/util/user_settings.h',
- 'browser/sync/util/user_settings_posix.cc',
- 'browser/sync/util/user_settings_win.cc',
- ],
- 'include_dirs': [
- '..',
- '<(protoc_out_dir)',
- ],
- 'defines' : [
- 'SYNC_ENGINE_VERSION_STRING="Unknown"',
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
- ],
- 'dependencies': [
- '../third_party/libjingle/libjingle.gyp:libjingle',
- 'sync_proto',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'sources' : [
- 'browser/sync/util/data_encryption.cc',
- 'browser/sync/util/data_encryption.h',
- 'browser/sync/util/path_helpers.cc',
- ],
- }],
- ['OS=="linux"', {
- 'defines': [
- 'POSIX',
- ],
- 'dependencies': [
- '../build/linux/system.gyp:gtk'
- ],
- }],
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
- ],
- },
- }],
- ],
- },
- ], # targets when browser_sync==1
- }],
], # 'conditions'
}
« no previous file with comments | « chrome/browser/views/toolbar_view.cc ('k') | chrome/test/live_sync/bookmark_model_verifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698