Chromium Code Reviews| Index: chrome/chrome_browser.gypi |
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
| index b3c2f412da2891f5a50cc8cb596dee148e39004c..42abeb99d842b619ce14347413078d874252c030 100644 |
| --- a/chrome/chrome_browser.gypi |
| +++ b/chrome/chrome_browser.gypi |
| @@ -1,4 +1,4 @@ |
| -# Copyright 2012 The Chromium Authors. All rights reserved. |
| +# Copyright 2013 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| @@ -33,12 +33,13 @@ |
| '../google_apis/google_apis.gyp:google_apis', |
| '../media/media.gyp:media', |
| '../skia/skia.gyp:skia', |
| - '../sync/protocol/sync_proto.gyp:sync_proto', |
| + '../sql/sql.gyp:sql', |
| # TODO(akalin): Depend only on sync_api from sync. |
| + '../sync/sync.gyp:sync_core', |
|
tim (not reviewing)
2013/01/22 23:29:59
Can you update the todo to mention that sync_core
Raghu Simha
2013/01/23 03:43:46
This is now moot. Targets outside sync.gyp should
|
| '../sync/sync.gyp:sync_api', |
| '../sync/sync.gyp:sync_internal_api', |
| '../sync/sync.gyp:sync_notifier', |
| - '../ui/ui.gyp:shell_dialogs', |
| + '../sync/sync.gyp:sync_proto', |
|
Ryan Sleevi
2013/01/23 01:05:20
If I understand your CL description, this should j
Raghu Simha
2013/01/23 03:43:46
I had tried rationalizing this in my response to F
|
| '../third_party/bzip2/bzip2.gyp:bzip2', |
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', |
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', |
| @@ -48,6 +49,7 @@ |
| '../third_party/zlib/zlib.gyp:minizip', |
| '../third_party/zlib/zlib.gyp:zlib', |
| '../ui/base/strings/ui_strings.gyp:ui_strings', |
| + '../ui/ui.gyp:shell_dialogs', |
| '../ui/ui.gyp:ui', |
| '../ui/ui.gyp:ui_resources', |
| '../webkit/support/webkit_support.gyp:user_agent', |
| @@ -59,6 +61,7 @@ |
| '<(SHARED_INTERMEDIATE_DIR)', |
| ], |
| 'export_dependent_settings': [ |
| + '../sql/sql.gyp:sql', |
| '../sync/sync.gyp:sync_notifier', |
|
Ryan Sleevi
2013/01/23 01:05:20
same here - why not ../sync/sync.gyp:sync
Raghu Simha
2013/01/23 03:43:46
Done.
|
| ], |
| 'sources': [ |