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

Unified Diff: chrome/chrome_tests.gypi

Issue 7020031: [Sync] Move chrome/browser/sync/api files into their own targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome_frame gyp error Created 9 years, 7 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_browser.gypi ('k') | chrome_frame/chrome_frame.gyp » ('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 bee903796efb6b02bf1c3db6ee00ec2623d0e3d5..cd0615654af3b96c8ccfdc777e968d2896e8e479 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -306,12 +306,12 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
- 'syncapi',
+ 'syncapi_core',
'test_support_sync',
],
'export_dependent_settings': [
'../base/base.gyp:base',
- 'syncapi',
+ 'syncapi_core',
'test_support_sync',
],
'include_dirs': [
@@ -323,6 +323,25 @@
],
},
{
+ 'target_name': 'test_support_syncapi_service',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../testing/gmock.gyp:gmock',
+ 'syncapi_service',
+ ],
+ 'export_dependent_settings': [
+ '../testing/gmock.gyp:gmock',
+ 'syncapi_service',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'browser/sync/api/syncable_service_mock.cc',
+ 'browser/sync/api/syncable_service_mock.h',
+ ],
+ },
+ {
'target_name': 'test_support_sync_notifier',
'type': 'static_library',
'dependencies': [
@@ -430,7 +449,7 @@
'chrome_resources',
'chrome_strings',
'debugger',
- 'syncapi',
+ 'syncapi_core',
'test_support_common',
'test_support_ui',
'../third_party/hunspell/hunspell.gyp:hunspell',
@@ -786,7 +805,7 @@
'chrome_resources',
'chrome_strings',
'common',
- 'syncapi',
+ 'syncapi_core',
'test_support_ui',
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
@@ -1617,8 +1636,6 @@
'browser/sync/sync_setup_wizard_unittest.cc',
'browser/sync/sync_ui_util_mac_unittest.mm',
'browser/sync/sync_ui_util_unittest.cc',
- 'browser/sync/api/syncable_service_mock.cc',
- 'browser/sync/api/syncable_service_mock.h',
'browser/sync/test_profile_sync_service.cc',
'browser/sync/test_profile_sync_service.h',
'browser/sync/util/cryptographer_unittest.cc',
@@ -3185,11 +3202,12 @@
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/libjingle/libjingle.gyp:libjingle',
'profile_import',
- 'syncapi',
+ 'syncapi_core',
'sync_notifier',
'test_support_common',
'test_support_sync',
'test_support_syncapi',
+ 'test_support_syncapi_service',
'test_support_sync_notifier',
'test_support_unit',
],
@@ -3661,7 +3679,7 @@
'test_support_common',
'browser',
'renderer',
- 'syncapi',
+ 'syncapi_core',
'../base/base.gyp:base',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
@@ -3780,7 +3798,7 @@
'dependencies': [
'chrome',
'debugger',
- 'syncapi',
+ 'syncapi_core',
'test_support_common',
'chrome_resources',
'chrome_strings',
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698