diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 19:46:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 19:46:18 +0000 |
| commit | 610c089bd27051ca8d2b983e784b31c533cbfef8 (patch) | |
| tree | 5405ca268d1302facfa03b84f75b1ca3240fdb52 /webkit/webkit.gyp | |
| parent | f0f9663246d5bd8a2d03721d7390bdb2db244e18 (diff) | |
| download | chromium_src-610c089bd27051ca8d2b983e784b31c533cbfef8.zip chromium_src-610c089bd27051ca8d2b983e784b31c533cbfef8.tar.gz chromium_src-610c089bd27051ca8d2b983e784b31c533cbfef8.tar.bz2 | |
Take out the activex control.BUG=20259
Review URL: http://codereview.chromium.org/200031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 4eb4d37..2d3f93c 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -155,7 +155,6 @@ ['OS=="win"', { 'dependencies': [ 'tools/test_shell/test_shell.gyp:*', - 'activex_shim_dll/activex_shim_dll.gyp:*', ], }], ], @@ -928,7 +927,6 @@ ], 'defines': [ '__PRETTY_FUNCTION__=__FUNCTION__', - 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', ], # This is needed because Event.h in this directory is blocked # by a system header on windows. @@ -1532,7 +1530,6 @@ ], 'dependencies': [ '../build/win/system.gyp:cygwin', - 'activex_shim/activex_shim.gyp:activex_shim', 'default_plugin/default_plugin.gyp:default_plugin', ], 'sources!': [ |