Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1475)

Unified Diff: content/content_tests.gypi

Issue 10388108: Implement media::VideoDecodeAccelerator on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b367ec3b83e218bb8b3252a3f8e4ca77f914a99e..b39f2a367d7120983dc00e2cb69f7a80a8b243e8 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -471,18 +471,26 @@
},
],
'conditions': [
- ['target_arch=="arm" or OS=="win"', {
+ ['target_arch=="arm" or OS=="win" or OS=="mac"', {
'targets': [
{
+ 'target_name': 'video_decode_accelerator_unittest',
Ami GONE FROM CHROMIUM 2012/05/17 21:44:47 Sorry, I was overly terse before. The reason the n
sail 2012/05/23 23:02:29 Done.
'conditions': [
['target_arch=="arm"', {
- 'target_name': 'omx_video_decode_accelerator_unittest',
'include_dirs': [
'<(DEPTH)/third_party/openmax/il',
],
}],
+ ['OS=="mac"', {
+ 'dependencies': [
+ '../ui/gl/gl.gyp:gl',
+ '../ui/ui.gyp:ui',
+ ],
+ 'sources!': [
+ 'common/gpu/media/rendering_helper_egl.cc',
+ ],
+ }],
['OS=="win"', {
- 'target_name': 'dxva_video_decode_accelerator_unittest',
'dependencies': [
'../third_party/angle/src/build_angle.gyp:libEGL',
'../third_party/angle/src/build_angle.gyp:libGLESv2',
@@ -510,6 +518,9 @@
'<(DEPTH)/third_party/angle/include',
],
'sources': [
+ 'common/gpu/media/rendering_helper.h',
+ 'common/gpu/media/rendering_helper_mac.mm',
+ 'common/gpu/media/rendering_helper_egl.cc',
'common/gpu/media/video_decode_accelerator_unittest.cc',
],
}
« content/common/gpu/media/video_decode_accelerator_unittest.cc ('K') | « content/content_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698