summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 20:10:30 +0000
committersdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 20:10:30 +0000
commit52a9eaa41c2d8b5dbf6dc24ad4d5a0c2148c2bec (patch)
tree6176f1e0ecad64945d59fd24790d1a6fb21b5572 /chrome
parentdc5c1ca51c1d9ca29564f9d3f8cbb0fef4789e71 (diff)
downloadchromium_src-52a9eaa41c2d8b5dbf6dc24ad4d5a0c2148c2bec.zip
chromium_src-52a9eaa41c2d8b5dbf6dc24ad4d5a0c2148c2bec.tar.gz
chromium_src-52a9eaa41c2d8b5dbf6dc24ad4d5a0c2148c2bec.tar.bz2
Fix DEPS and project dependencies
Nothing above chrome/common/ depends yet on components/bookmarks/ so remove the inclusion of components/bookmarks from chrome/browser/. No project above chrome/common_constants.gyp directly depends on components.gyp:bookmarks_core_common, so fix the dependencies. BUG=360613 R=thestig@chromium.org,tfarina@chromium.org,blundell@chromium.org Review URL: https://codereview.chromium.org/233953002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/DEPS1
-rw-r--r--chrome/chrome_browser.gypi1
-rw-r--r--chrome/common_constants.gyp1
3 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 04cfe6e..d0785fd 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -12,7 +12,6 @@ include_rules = [
"+components/autofill/content/common",
"+components/autofill/core/browser",
"+components/autofill/core/common",
- "+components/bookmarks",
"+components/breakpad",
"+components/dom_distiller",
"+components/domain_reliability",
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b567c33..682bea9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -28,7 +28,6 @@
'safe_browsing_report_proto',
'suggestions_proto',
'../components/components.gyp:autofill_core_browser',
- '../components/components.gyp:bookmarks_core_common',
'../components/components.gyp:cloud_devices',
'../components/components.gyp:domain_reliability',
'../components/components.gyp:favicon_core',
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index be9a8b2..50b3574 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -73,6 +73,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../components/components.gyp:bookmarks_core_common',
'../components/nacl.gyp:nacl_switches',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
],