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

Unified Diff: chrome/chrome.gyp

Issue 10147003: [Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Win update errors Created 8 years, 8 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/sync/test_profile_sync_service.cc ('k') | chrome/chrome_browser.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 5d7f0179e4d5e4feb027f17695cede6f5e329d22..dac2e3a7ffde8c0c904fe5025ca486d369810d9f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -26,12 +26,12 @@
'debugger',
'plugin',
'renderer',
- 'syncapi_core',
'utility',
'../content/content.gyp:content_app',
'../content/content.gyp:content_gpu',
'../content/content.gyp:content_ppapi_plugin',
'../content/content.gyp:content_worker',
+ '../sync/sync.gyp:syncapi_core',
'../printing/printing.gyp:printing',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources',
],
@@ -264,72 +264,6 @@
],
},
{
- # 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/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.gyp:sync_notifier',
- '../sync/sync.gyp:sync',
- ],
- 'export_dependent_settings': [
- '../sync/protocol/sync_proto.gyp:sync_proto',
- '../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',
« no previous file with comments | « chrome/browser/sync/test_profile_sync_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698