summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-02-19 12:10:36 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-19 20:11:23 +0000
commit202c0025407999db640d5983144d750733b866af (patch)
treebfa52cea1383c2fbadd91155451c17a3b6a10437
parent23543f0d6b0b45854c447a1d5024add9e33a4150 (diff)
downloadchromium_src-202c0025407999db640d5983144d750733b866af.zip
chromium_src-202c0025407999db640d5983144d750733b866af.tar.gz
chromium_src-202c0025407999db640d5983144d750733b866af.tar.bz2
Remove dependency on autofill_core_browser from policy_component.
policy_component doesn't need to depend on autofill_core_browser. Also added dependency on gfx_geometry in favicon_base. policy_component was failing to compile without it. BUG=458581 Review URL: https://codereview.chromium.org/926093002 Cr-Commit-Position: refs/heads/master@{#317118}
-rw-r--r--components/favicon_base.gypi1
-rw-r--r--components/favicon_base/BUILD.gn2
-rw-r--r--components/policy/core/browser/BUILD.gn1
-rw-r--r--components/policy/policy_browser.gypi3
4 files changed, 5 insertions, 2 deletions
diff --git a/components/favicon_base.gypi b/components/favicon_base.gypi
index 97f5aeb..0ea6331 100644
--- a/components/favicon_base.gypi
+++ b/components/favicon_base.gypi
@@ -16,6 +16,7 @@
'../skia/skia.gyp:skia',
'../ui/base/ui_base.gyp:ui_base',
'../ui/gfx/gfx.gyp:gfx',
+ '../ui/gfx/gfx.gyp:gfx_geometry',
'../url/url.gyp:url_lib',
],
'sources': [
diff --git a/components/favicon_base/BUILD.gn b/components/favicon_base/BUILD.gn
index 57c42a4..07daa0a 100644
--- a/components/favicon_base/BUILD.gn
+++ b/components/favicon_base/BUILD.gn
@@ -24,6 +24,7 @@ source_set("favicon_base") {
"//skia",
"//ui/base",
"//ui/gfx",
+ "//ui/gfx/geometry",
"//url",
]
}
@@ -39,5 +40,6 @@ source_set("unit_tests") {
"//testing/gtest",
"//ui/base",
"//ui/gfx",
+ "//ui/gfx/geometry",
]
}
diff --git a/components/policy/core/browser/BUILD.gn b/components/policy/core/browser/BUILD.gn
index 6de6120..d9f1a63 100644
--- a/components/policy/core/browser/BUILD.gn
+++ b/components/policy/core/browser/BUILD.gn
@@ -54,7 +54,6 @@ source_set("browser") {
]
deps += [
- "//components/autofill/core/browser",
"//components/autofill/core/common",
"//components/policy",
"//components/policy/proto",
diff --git a/components/policy/policy_browser.gypi b/components/policy/policy_browser.gypi
index 987da77..dc42169 100644
--- a/components/policy/policy_browser.gypi
+++ b/components/policy/policy_browser.gypi
@@ -34,7 +34,8 @@
# GN version: //components/policy/core/browser
['configuration_policy==1', {
'dependencies': [
- 'autofill_core_browser',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
'autofill_core_common',
'cloud_policy_proto',
'policy',