summaryrefslogtreecommitdiffstats
path: root/webkit/default_plugin
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-13 15:12:59 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-13 15:12:59 +0000
commitadc0fc28c932ae503d5392577c4d232bc478b8fb (patch)
tree73fb7adf1b7a58aa376fd85c2672061210280ea9 /webkit/default_plugin
parent5c2387504ee4124ce0521212d895bae87cf08d8f (diff)
downloadchromium_src-adc0fc28c932ae503d5392577c4d232bc478b8fb.zip
chromium_src-adc0fc28c932ae503d5392577c4d232bc478b8fb.tar.gz
chromium_src-adc0fc28c932ae503d5392577c4d232bc478b8fb.tar.bz2
Remove unnecessary addition of urlmon.lib to AdditionalDependencies
of activex_shim. Add it as a dependency of default_plugin. Add urlmon.lib to AdditionalDependencies in unittests.vcproj (going away soon, but this makes the transition smooth). BUG=none TEST=none Review URL: http://codereview.chromium.org/125099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin')
-rw-r--r--webkit/default_plugin/default_plugin.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index dd4ca16..2aeac4e 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -15,13 +15,14 @@
'target_name': 'default_plugin',
'type': '<(library)',
'dependencies': [
- '../../third_party/libxml/libxml.gyp:libxml',
+ '../../net/net.gyp:net_resources',
'../../third_party/icu38/icu38.gyp:icui18n',
'../../third_party/icu38/icu38.gyp:icuuc',
+ '../../third_party/libxml/libxml.gyp:libxml',
'../../third_party/npapi/npapi.gyp:npapi',
+ '../activex_shim/activex_shim.gyp:activex_shim',
'../webkit.gyp:webkit_resources',
'../webkit.gyp:webkit_strings',
- '../../net/net.gyp:net_resources',
],
'include_dirs': [
'../..',