summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:25:09 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:25:09 +0000
commit1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc (patch)
tree907cd1f3e07b67526d4cb29209c896425d4cdf3b /webkit
parentb0da24bc22a1726c240f8d9392381ff66c4cca3c (diff)
downloadchromium_src-1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc.zip
chromium_src-1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc.tar.gz
chromium_src-1fd3ddc659f381c285c35f29ea8bdd33b06a1dfc.tar.bz2
Enable media.dll / libmedia.so.
Review URL: http://codereview.chromium.org/7572040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 0344333..ef333b32 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -104,8 +104,9 @@
'type': 'static_library',
'dependencies': [
'<(DEPTH)/base/base.gyp:base_i18n',
- '<(DEPTH)/base/base.gyp:base_static',
+ '<(DEPTH)/base/base.gyp:base_static',
'<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
+ '<(DEPTH)/media/media.gyp:yuv_convert',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
'<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',