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

Unified Diff: chrome/chrome_tests.gypi

Issue 11348052: [sync] Componentize sync: Part 1: Clean up sync.gyp and update chrome / test dependencies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase one last time Created 8 years, 1 month 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_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('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 2e3c289bcbabfda148872d91a7cb3073b75d3456..11be8e8bda45a5f06144f658974694c36162be31 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -135,7 +135,7 @@
'type': 'executable',
'dependencies': [
'../sync/protocol/sync_proto.gyp:sync_proto',
- '../sync/sync.gyp:syncapi_core',
+ '../sync/sync.gyp:sync_api',
'chrome',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
@@ -385,7 +385,7 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
- '../sync/sync.gyp:syncapi_core',
+ '../sync/sync.gyp:sync_api',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -713,7 +713,8 @@
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../sync/protocol/sync_proto.gyp:sync_proto',
- '../sync/sync.gyp:test_support_syncapi_service',
+ '../sync/sync.gyp:sync_notifier',
+ '../sync/sync.gyp:test_support_sync_api',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/cld/cld.gyp:cld',
@@ -1922,6 +1923,7 @@
'../net/net.gyp:net_test_support',
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync_notifier',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
@@ -2083,6 +2085,7 @@
'common/extensions/api/api.gyp:api',
'test_support_common',
'../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync_notifier',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
],
@@ -2365,7 +2368,7 @@
'../base/base.gyp:base',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
- '../sync/sync.gyp:syncapi_core',
+ '../sync/sync.gyp:sync_api',
],
'include_dirs': [
'..',
@@ -2428,7 +2431,7 @@
'debugger',
'test_support_common',
'../skia/skia.gyp:skia',
- '../sync/sync.gyp:syncapi_core',
+ '../sync/sync.gyp:sync_api',
'../testing/gtest.gyp:gtest',
],
'export_dependent_settings': [
@@ -2664,7 +2667,7 @@
# Win bot needs to be turned into an interactive bot.
'interactive_ui_tests',
# Disabled from running in coverage_posix.py.
- # We need to build this during compile step, so enabling here.
+ # We need to build this during compile step, so enabling here.
'browser_tests',
'../courgette/courgette.gyp:courgette_unittests',
'../crypto/crypto.gyp:crypto_unittests',
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698