| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index c42e95f71abaa7fd051b1ee81026a05487ece8ed..8a8417edf80dbb6a73670216ed2f2dcfbba8beaf 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -113,7 +113,7 @@
|
| }, {
|
| 'dependencies': [
|
| # TODO: This should build on Android and the target should move to the list above.
|
| - '../sync/sync.gyp:*',
|
| + '../components/sync.gyp:*',
|
| ],
|
| 'conditions': [
|
| ['OS!="ios"', {
|
| @@ -148,7 +148,7 @@
|
| '../ppapi/tools/ppapi_tools.gyp:*',
|
| '../services/shell/shell.gyp:*',
|
| '../skia/skia.gyp:*',
|
| - '../sync/tools/sync_tools.gyp:*',
|
| + '../components/sync/tools/sync_tools.gyp:*',
|
| '../third_party/catapult/telemetry/telemetry.gyp:*',
|
| '../third_party/WebKit/public/all.gyp:*',
|
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
|
| @@ -310,7 +310,7 @@
|
| '../net/net.gyp:net_unittests',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| '../ui/display/display.gyp:display_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| @@ -795,7 +795,7 @@
|
| '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../testing/android/junit/junit_test.gyp:junit_unit_tests',
|
| '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
|
| '../third_party/WebKit/public/all.gyp:*',
|
| @@ -826,7 +826,7 @@
|
| '../net/net.gyp:net_unittests_apk',
|
| '../skia/skia_tests.gyp:skia_unittests_apk',
|
| '../sql/sql.gyp:sql_unittests_apk',
|
| - '../sync/sync.gyp:sync_unit_tests_apk',
|
| + '../components/sync.gyp:sync_unit_tests_apk',
|
| '../ui/android/ui_android.gyp:ui_android_unittests_apk',
|
| '../ui/android/ui_android.gyp:ui_junit_tests',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
|
| @@ -910,7 +910,7 @@
|
| '../rlz/rlz.gyp:*',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
|
| '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
|
| '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
|
| @@ -949,7 +949,7 @@
|
| '../remoting/remoting.gyp:remoting_unittests',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
|
| '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
|
| '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
|
| @@ -1021,7 +1021,7 @@
|
| '../remoting/remoting.gyp:remoting_unittests',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
|
| '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
|
| '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
|
| @@ -1113,7 +1113,7 @@
|
| '../remoting/remoting.gyp:remoting_unittests',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
|
| '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
|
| '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
|
| @@ -1169,7 +1169,7 @@
|
| '../net/net.gyp:net_unittests',
|
| '../printing/printing.gyp:printing_unittests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| '../ui/gl/gl_tests.gyp:gl_unittests',
|
| @@ -1250,7 +1250,7 @@
|
| '../base/base.gyp:base_unittests',
|
| '../ipc/ipc.gyp:ipc_tests',
|
| '../sql/sql.gyp:sql_unittests',
|
| - '../sync/sync.gyp:sync_unit_tests',
|
| + '../components/sync.gyp:sync_unit_tests',
|
| ],
|
| }],
|
| ['chromeos==1', {
|
|
|