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

Unified Diff: content/content_tests.gypi

Issue 8510039: Initial implementation of the DXVA 2.0 H.264 hardware decoder for pepper for Windows. The decodin... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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
===================================================================
--- content/content_tests.gypi (revision 115211)
+++ content/content_tests.gypi (working copy)
@@ -402,10 +402,10 @@
},
],
'conditions': [
- ['target_arch=="arm"', {
+ ['target_arch=="arm" or OS=="win"', {
'targets': [
{
- 'target_name': 'omx_video_decode_accelerator_unittest',
+ 'target_name': 'video_decode_accelerator_unittest',
'defines!': ['CONTENT_IMPLEMENTATION'],
'type': 'executable',
'dependencies': [
@@ -415,10 +415,21 @@
],
'include_dirs': [
'<(DEPTH)/third_party/angle/include',
- '<(DEPTH)/third_party/openmax/il',
],
+ 'conditions': [
+ ['target_arch=="arm"', {
+ 'include_dirs': [
+ '<(DEPTH)/third_party/openmax/il',
+ ],
+ }],
+ ['OS=="win"', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
'sources': [
- 'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
+ 'common/gpu/media/video_decode_accelerator_unittest.cc',
],
}
],

Powered by Google App Engine
This is Rietveld 408576698