summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 22:03:16 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 22:03:16 +0000
commit1318e92f70e240d7ae71320ea7e4fcae18f2ce3e (patch)
tree412ee9192a850d9867bea3a841d800f67081ebe3 /chrome/chrome.gyp
parent9fcd39385ae39a68d3509238bd9ef83af1868fc7 (diff)
downloadchromium_src-1318e92f70e240d7ae71320ea7e4fcae18f2ce3e.zip
chromium_src-1318e92f70e240d7ae71320ea7e4fcae18f2ce3e.tar.gz
chromium_src-1318e92f70e240d7ae71320ea7e4fcae18f2ce3e.tar.bz2
Resubmit GpuVideoDecoder and related patches.
BUG=53714 TEST=Tree is green Review URL: http://codereview.chromium.org/3442006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d561e3a..7554cb7 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -693,6 +693,7 @@
'../app/app.gyp:app_base',
'../base/base.gyp:base',
'common',
+ '../media/media.gyp:media',
'../skia/skia.gyp:skia',
],
'sources': [
@@ -721,6 +722,8 @@
'gpu/media/gpu_video_device.h',
'gpu/media/fake_gl_video_decode_engine.cc',
'gpu/media/fake_gl_video_decode_engine.h',
+ 'gpu/media/fake_gl_video_device.cc',
+ 'gpu/media/fake_gl_video_device.h',
],
'include_dirs': [
'..',