summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:58:51 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:58:51 +0000
commitd3c8aa84c5bf94c58b88b35d169694837cb454e5 (patch)
tree658c8300583e4adb5148c0d093677bf14690e28c /webkit
parent4fbd79f46b1e5c580238c3cf0a8532144019e7d0 (diff)
downloadchromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.zip
chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.gz
chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.bz2
Revert r95841 due to failing media_unittests on linux_shared bot.
TBR=fischman@chromium.org Review URL: http://codereview.chromium.org/7601002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue.gypi3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index ef333b32..0344333 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -104,9 +104,8 @@
'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',