diff options
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b1a966f..c04b4084 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -153,8 +153,7 @@ '../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', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libpng/libpng.gyp:libpng', @@ -462,7 +461,7 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync_api', + '../sync/sync.gyp:sync', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', @@ -928,11 +927,11 @@ '../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', '../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', @@ -1768,7 +1767,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', @@ -1781,6 +1779,7 @@ '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', + '../sync/sync.gyp:sync', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cld/cld.gyp:cld', @@ -2070,7 +2069,6 @@ 'type': 'executable', 'dependencies': [ 'browser', - '../sync/protocol/sync_proto.gyp:sync_proto', 'chrome', 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', @@ -2083,7 +2081,7 @@ '../net/net.gyp:net', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync_notifier', + '../sync/sync.gyp:sync', '../sync/sync.gyp:test_support_sync_testserver', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -2107,8 +2105,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', @@ -2246,13 +2242,12 @@ 'target_name': 'sync_performance_tests', 'type': 'executable', 'dependencies': [ - '../sync/protocol/sync_proto.gyp:sync_proto', 'browser', 'chrome', 'common/extensions/api/api.gyp:api', 'test_support_common', '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync_notifier', + '../sync/sync.gyp:sync', '../sync/sync.gyp:test_support_sync_testserver', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -2270,8 +2265,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', @@ -2557,11 +2550,11 @@ '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', - '../sync/sync.gyp:sync_api', + '../sync/sync.gyp:sync', ], 'include_dirs': [ '..', @@ -2610,7 +2603,7 @@ 'debugger', 'test_support_common', '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync_api', + '../sync/sync.gyp:sync', '../testing/gtest.gyp:gtest', ], 'export_dependent_settings': [ |