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

Unified Diff: chrome/chrome_browser.gypi

Issue 11412211: [sync] Componentize sync: Part Final: Target 'sync' is now its own component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make sure sync_proto is linked into just one component Created 7 years, 11 months 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
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 364185a9c9420ee37378987933f9181de105029d..6da06746563deba998244753c84d82bbdb9514fb 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.
@@ -35,12 +35,8 @@
'../google_apis/google_apis.gyp:google_apis',
'../media/media.gyp:media',
'../skia/skia.gyp:skia',
- '../sync/protocol/sync_proto.gyp:sync_proto',
- # TODO(akalin): Depend only on sync_api from sync.
- '../sync/sync.gyp:sync_api',
- '../sync/sync.gyp:sync_internal_api',
- '../sync/sync.gyp:sync_notifier',
- '../ui/ui.gyp:shell_dialogs',
+ '../sql/sql.gyp:sql',
+ '../sync/sync.gyp:sync',
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
@@ -51,6 +47,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',
@@ -62,7 +59,8 @@
'<(SHARED_INTERMEDIATE_DIR)',
],
'export_dependent_settings': [
- '../sync/sync.gyp:sync_notifier',
+ '../sql/sql.gyp:sql',
+ '../sync/sync.gyp:sync',
],
'sources': [
# All .cc, .h, .m, and .mm files under browser except for:
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | sync/sync.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698