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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

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/chrome.gyp ('k') | sync/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d055dd320614633543e7e913f06d2d7001259b0f..da331aae3dbf1b80d9af2775d2bf768ab509442b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -374,61 +374,22 @@
],
},
{
- 'target_name': 'test_support_sync',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'sync',
- ],
- 'export_dependent_settings': [
- '../base/base.gyp:base',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- 'sync',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'browser/sync/js/js_test_util.cc',
- 'browser/sync/js/js_test_util.h',
- 'browser/sync/syncable/model_type_test_util.cc',
- 'browser/sync/syncable/model_type_test_util.h',
- 'browser/sync/syncable/syncable_mock.cc',
- 'browser/sync/syncable/syncable_mock.h',
- 'browser/sync/test/fake_encryptor.cc',
- 'browser/sync/test/fake_encryptor.h',
- 'browser/sync/test/fake_extensions_activity_monitor.cc',
- 'browser/sync/test/fake_extensions_activity_monitor.h',
- 'browser/sync/test/null_directory_change_delegate.cc',
- 'browser/sync/test/null_directory_change_delegate.h',
- 'browser/sync/test/null_transaction_observer.cc',
- 'browser/sync/test/null_transaction_observer.h',
- 'browser/sync/test/engine/test_directory_setter_upper.cc',
- 'browser/sync/test/engine/test_directory_setter_upper.h',
- ],
- },
- {
'target_name': 'test_support_syncapi',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'syncapi_core',
- 'test_support_sync',
+ '../sync/sync.gyp:test_support_sync',
],
'export_dependent_settings': [
'../base/base.gyp:base',
'syncapi_core',
- 'test_support_sync',
+ '../sync/sync.gyp:test_support_sync',
],
'include_dirs': [
'..',
],
'sources': [
- 'browser/sync/internal_api/includes/test_unrecoverable_error_handler.cc',
- 'browser/sync/internal_api/includes/test_unrecoverable_error_handler.h',
'browser/sync/test/engine/test_user_share.cc',
'browser/sync/test/engine/test_user_share.h',
],
@@ -1235,7 +1196,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'test_support_common',
- 'test_support_sync',
+ '../sync/sync.gyp:test_support_sync',
'test_support_syncapi',
'test_support_syncapi_service',
'test_support_sync_notifier',
@@ -1802,7 +1763,6 @@
'browser/sync/test_profile_sync_service.h',
'browser/sync/test/test_http_bridge_factory.cc',
'browser/sync/test/test_http_bridge_factory.h',
- 'browser/sync/util/nigori_unittest.cc',
'browser/tab_contents/render_view_context_menu_unittest.cc',
'browser/tab_contents/thumbnail_generator_unittest.cc',
'browser/tabs/pinned_tab_codec_unittest.cc',
@@ -3675,37 +3635,15 @@
'target_name': 'sync_unit_tests',
'type': 'executable',
'sources': [
- '<(protoc_out_dir)//sync/protocol/test.pb.cc',
'../base/test/run_all_unittests.cc',
- 'app/breakpad_mac_stubs.mm',
'browser/sync/api/sync_change_unittest.cc',
'browser/sync/api/sync_error_unittest.cc',
- 'browser/sync/engine/apply_updates_command_unittest.cc',
- 'browser/sync/engine/build_commit_command_unittest.cc',
- 'browser/sync/engine/clear_data_command_unittest.cc',
- 'browser/sync/engine/cleanup_disabled_types_command_unittest.cc',
- 'browser/sync/engine/download_updates_command_unittest.cc',
- 'browser/sync/engine/model_changing_syncer_command_unittest.cc',
- 'browser/sync/engine/model_safe_worker_unittest.cc',
- 'browser/sync/engine/nigori_util_unittest.cc',
- 'browser/sync/engine/process_commit_response_command_unittest.cc',
- 'browser/sync/engine/process_updates_command_unittest.cc',
- 'browser/sync/engine/resolve_conflicts_command_unittest.cc',
- 'browser/sync/engine/syncer_proto_util_unittest.cc',
- 'browser/sync/engine/sync_scheduler_unittest.cc',
- 'browser/sync/engine/sync_scheduler_whitebox_unittest.cc',
- 'browser/sync/engine/syncer_unittest.cc',
- 'browser/sync/engine/syncproto_unittest.cc',
- 'browser/sync/engine/verify_updates_command_unittest.cc',
'browser/sync/internal_api/change_record_unittest.cc',
'browser/sync/internal_api/debug_info_event_listener_unittest.cc',
- 'browser/sync/internal_api/syncapi_mock.h',
'browser/sync/internal_api/syncapi_server_connection_manager_unittest.cc',
'browser/sync/internal_api/syncapi_unittest.cc',
- 'browser/sync/js/js_arg_list_unittest.cc',
- 'browser/sync/js/js_event_details_unittest.cc',
- 'browser/sync/js/js_mutation_event_observer_unittest.cc',
- 'browser/sync/js/js_sync_manager_observer_unittest.cc',
+ 'browser/sync/internal_api/js_mutation_event_observer_unittest.cc',
+ 'browser/sync/internal_api/js_sync_manager_observer_unittest.cc',
'browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc',
'browser/sync/notifier/chrome_invalidation_client_unittest.cc',
'browser/sync/notifier/chrome_system_resources_unittest.cc',
@@ -3714,56 +3652,12 @@
'browser/sync/notifier/p2p_notifier_unittest.cc',
'browser/sync/notifier/registration_manager_unittest.cc',
'browser/sync/notifier/sync_notifier_factory_unittest.cc',
- 'browser/sync/protocol/proto_enum_conversions_unittest.cc',
- 'browser/sync/protocol/proto_value_conversions_unittest.cc',
- 'browser/sync/sessions/ordered_commit_set_unittest.cc',
- 'browser/sync/sessions/session_state_unittest.cc',
- 'browser/sync/sessions/status_controller_unittest.cc',
- 'browser/sync/sessions/sync_session_context_unittest.cc',
- 'browser/sync/sessions/sync_session_unittest.cc',
- 'browser/sync/sessions/test_util.cc',
- 'browser/sync/sessions/test_util.h',
- 'browser/sync/sync_js_controller_unittest.cc',
- 'browser/sync/syncable/directory_backing_store_unittest.cc',
- 'browser/sync/syncable/model_type_payload_map_unittest.cc',
- 'browser/sync/syncable/model_type_unittest.cc',
- 'browser/sync/syncable/syncable_enum_conversions_unittest.cc',
- 'browser/sync/syncable/syncable_id_unittest.cc',
- 'browser/sync/syncable/syncable_unittest.cc',
- 'browser/sync/test/engine/fake_model_safe_worker_registrar.cc',
- 'browser/sync/test/engine/fake_model_safe_worker_registrar.h',
- 'browser/sync/test/engine/fake_model_worker.cc',
- 'browser/sync/test/engine/fake_model_worker.h',
- 'browser/sync/test/engine/mock_connection_manager.cc',
- 'browser/sync/test/engine/mock_connection_manager.h',
- 'browser/sync/test/engine/syncer_command_test.cc',
- 'browser/sync/test/engine/syncer_command_test.h',
- 'browser/sync/test/engine/test_id_factory.h',
- 'browser/sync/test/engine/test_syncable_utils.cc',
- 'browser/sync/test/engine/test_syncable_utils.h',
- 'browser/sync/test/sessions/test_scoped_session_event_listener.h',
- 'browser/sync/test/test_directory_backing_store.cc',
- 'browser/sync/test/test_directory_backing_store.h',
- 'browser/sync/util/cryptographer_unittest.cc',
- 'browser/sync/util/data_encryption_unittest.cc',
- 'browser/sync/util/data_type_histogram_unittest.cc',
- 'browser/sync/util/enum_set_unittest.cc',
- 'browser/sync/util/get_session_name_unittest.cc',
- 'browser/sync/util/immutable_unittest.cc',
- 'browser/sync/util/protobuf_unittest.cc',
- 'browser/sync/util/weak_handle_unittest.cc',
],
'include_dirs': [
'..',
- '<(protoc_out_dir)',
- ],
- 'defines' : [
- 'SYNC_ENGINE_VERSION_STRING="Unknown"',
- '_CRT_SECURE_NO_WARNINGS',
- '_USE_32BIT_TIME_T',
],
'dependencies': [
- '../sync/protocol/sync_proto.gyp:sync_proto',
+ '../sync/sync.gyp:sync_tests',
'../base/base.gyp:test_support_base',
'../jingle/jingle.gyp:notifier_test_util',
'../net/net.gyp:net',
@@ -3772,54 +3666,18 @@
'../testing/gtest.gyp:gtest',
'syncapi_core',
'sync_notifier',
- 'test_support_sync',
'test_support_syncapi',
'test_support_syncapi_service',
'test_support_sync_notifier',
],
+
+ # TODO(akalin): This is needed because histogram.cc uses
+ # leak_annotations.h, which pulls this in. Make 'base'
+ # propagate this dependency.
'conditions': [
- ['OS=="win"', {
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
- 'link_settings': {
- 'libraries': [
- '-lcrypt32.lib',
- '-lws2_32.lib',
- '-lsecur32.lib',
- ],
- },
- 'configurations': {
- 'Debug_Base': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
- },
- },
- },
- },
- }, { # else: OS != "win"
- 'sources!': [
- 'browser/sync/util/data_encryption_unittest.cc',
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['OS=="linux" and linux_use_tcmalloc==1', {
'dependencies': [
- '../build/linux/system.gyp:ssl',
- ],
- }],
- ['OS=="linux" and chromeos==1', {
- 'include_dirs': [
- '<(grit_out_dir)',
+ '../base/allocator/allocator.gyp:allocator',
],
}],
],
« no previous file with comments | « chrome/chrome.gyp ('k') | sync/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698