summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorjiangj@opera.com <jiangj@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-14 15:36:57 +0000
committerjiangj@opera.com <jiangj@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-14 15:36:57 +0000
commit78c5172b1ba95b9435d8be44af3adc16cc5c0ed5 (patch)
tree485c4c9c15c19f32b6f906db8412b9f10a754780 /chrome/chrome_dll.gypi
parentb61b05ce8dafabe9b60cd9165d85255f39c3a193 (diff)
downloadchromium_src-78c5172b1ba95b9435d8be44af3adc16cc5c0ed5.zip
chromium_src-78c5172b1ba95b9435d8be44af3adc16cc5c0ed5.tar.gz
chromium_src-78c5172b1ba95b9435d8be44af3adc16cc5c0ed5.tar.bz2
Fix policy_component shared_library link without configuration_policy
It should depend on url_matcher as url_blacklist_manager uses it. Review URL: https://codereview.chromium.org/284493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index fc2cc1c..8891d27 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -78,7 +78,6 @@
},
'dependencies': [
'<@(chromium_browser_dependencies)',
- '../components/components.gyp:policy',
'../content/content.gyp:content_app_browser',
],
'conditions': [
@@ -87,6 +86,11 @@
'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
],
}],
+ ['OS=="win" and configuration_policy==1', {
+ 'dependencies': [
+ '<(DEPTH)/components/components.gyp:policy',
+ ],
+ }],
['use_aura==1', {
'dependencies': [
'../ui/compositor/compositor.gyp:compositor',