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

Unified Diff: chrome/chrome_tests.gypi

Issue 11412211: [sync] Componentize sync: Part Final: Target 'sync' is now its own component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + merge with net->sync dependency fix (no code changes) Created 7 years, 11 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2be4d6672a08303bd04b92b3d33e1929e41887b6..d057575fb824ea250faaf0cdc67179ecebd08cb7 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -153,8 +153,8 @@
'../net/net.gyp:net_resources',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
- '../sync/protocol/sync_proto.gyp:sync_proto',
'../sync/sync.gyp:sync_api',
+ '../sync/sync.gyp:sync_proto',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libpng/libpng.gyp:libpng',
@@ -868,11 +868,12 @@
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
- '../sync/protocol/sync_proto.gyp:sync_proto',
'../sync/sync.gyp:sync_notifier',
+ '../sync/sync.gyp:sync_proto',
'../sync/sync.gyp:test_support_sync_api',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
'../third_party/cld/cld.gyp:cld',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -1684,7 +1685,6 @@
'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
'dependencies': [
'browser',
- '../sync/protocol/sync_proto.gyp:sync_proto',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:packed_extra_resources',
@@ -1697,6 +1697,7 @@
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync_proto',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/cld/cld.gyp:cld',
@@ -1986,7 +1987,6 @@
'type': 'executable',
'dependencies': [
'browser',
- '../sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
@@ -2023,8 +2023,6 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_version.rc.version',
- 'browser/sessions/session_backend.cc',
- 'browser/sync/glue/session_model_associator.cc',
'test/base/chrome_test_launcher.cc',
'test/data/resource.rc',
'browser/sync/test/integration/apps_helper.cc',
@@ -2155,7 +2153,6 @@
'target_name': 'sync_performance_tests',
'type': 'executable',
'dependencies': [
- '../sync/protocol/sync_proto.gyp:sync_proto',
'browser',
'chrome',
'common/extensions/api/api.gyp:api',
@@ -2179,8 +2176,6 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_version.rc.version',
- 'browser/sessions/session_backend.cc',
- 'browser/sync/glue/session_model_associator.cc',
'browser/sync/test/integration/autofill_helper.cc',
'browser/sync/test/integration/autofill_helper.h',
'browser/sync/test/integration/bookmarks_helper.cc',
@@ -2458,7 +2453,7 @@
'test_support_common',
'browser',
'renderer',
- 'chrome_resources.gyp:packed_resources',
+ 'chrome_resources.gyp:packed_resources',
'../base/base.gyp:base',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',

Powered by Google App Engine
This is Rietveld 408576698