| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 123b2a3f87756df5cb57b0c33bde6e0f9c664fd2..565e57885106d8f69e86661dc2ffafea0488aba8 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -1685,8 +1685,8 @@
|
| '../net/net.gyp:net_test_support',
|
| '../ppapi/ppapi_internal.gyp:ppapi_tests',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:sync',
|
| - '../sync/sync.gyp:test_support_sync_api',
|
| + '../components/sync.gyp:sync',
|
| + '../components/sync.gyp:test_support_sync_api',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/hunspell/hunspell.gyp:hunspell',
|
| @@ -2210,8 +2210,8 @@
|
| '../net/net.gyp:net_test_support',
|
| '../sdch/sdch.gyp:sdch',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:sync',
|
| - '../sync/sync.gyp:test_support_sync_api',
|
| + '../components/sync.gyp:sync',
|
| + '../components/sync.gyp:test_support_sync_api',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../testing/perf/perf_test.gyp:*',
|
| @@ -2775,7 +2775,7 @@
|
| '../net/net.gyp:net',
|
| '../net/net.gyp:net_test_support',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:sync',
|
| + '../components/sync.gyp:sync',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../testing/perf/perf_test.gyp:*',
|
| @@ -2870,9 +2870,9 @@
|
| '../content/content_shell_and_tests.gyp:content_browser_test_base',
|
| '../net/net.gyp:net',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:sync',
|
| - '../sync/sync.gyp:test_support_sync_fake_server',
|
| - '../sync/sync.gyp:test_support_sync_testserver',
|
| + '../components/sync.gyp:sync',
|
| + '../components/sync.gyp:test_support_sync_fake_server',
|
| + '../components/sync.gyp:test_support_sync_testserver',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -2939,7 +2939,7 @@
|
| 'test_support_common',
|
| 'test_support_sync_integration',
|
| 'test_support_ui',
|
| - '../sync/sync.gyp:sync',
|
| + '../components/sync.gyp:sync',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/icu/icu.gyp:icui18n',
|
| @@ -3040,7 +3040,7 @@
|
| 'dependencies': [
|
| 'test_support_sync_integration',
|
| 'test_support_ui',
|
| - '../sync/sync.gyp:sync',
|
| + '../components/sync.gyp:sync',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| ],
|
| @@ -3158,7 +3158,7 @@
|
| '../base/base.gyp:base',
|
| '../base/base.gyp:base_java_test_support',
|
| '../base/base.gyp:base_junit_test_support',
|
| - '../sync/sync.gyp:sync_java_test_support',
|
| + '../components/sync.gyp:sync_java_test_support',
|
| '../testing/android/junit/junit_test.gyp:junit_test_support',
|
| ],
|
| 'variables': {
|
| @@ -3200,8 +3200,8 @@
|
| '../content/content_shell_and_tests.gyp:content_java_test_support',
|
| '../net/net.gyp:net_java',
|
| '../net/net.gyp:net_java_test_support',
|
| - '../sync/sync.gyp:sync_java',
|
| - '../sync/sync.gyp:sync_java_test_support',
|
| + '../components/sync.gyp:sync_java',
|
| + '../components/sync.gyp:sync_java_test_support',
|
| '../third_party/android_tools/android_tools.gyp:google_play_services_javalib'
|
| ],
|
| 'includes': [ '../build/java.gypi' ],
|
|
|