Initial implementation of the DXVA 2.0 H.264 hardware decoder for pepper for Windows. The decodin...

content/content_tests.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 384 matching lines @@
         }],
         ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
           'dependencies': [
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
       ],
     },
   ],
   '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': [
+            '../base/allocator/allocator.gyp:allocator',

[Ami GONE FROM CHROMIUM, 2011/12/21 01:41:16]

This breaks compilation on cros/arm.

[ananta, 2011/12/21 02:59:58]

Made this conditional for windows.

             '../base/base.gyp:base',
             'content',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/angle/include',
-            '<(DEPTH)/third_party/openmax/il',
           ],
+          'conditions': [
+            ['target_arch=="arm"', {
+              'include_dirs': [
+                '<(DEPTH)/third_party/openmax/il',
+              ],
+            }],
+          ],  
           'sources': [
-            'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
+            'common/gpu/media/video_decode_accelerator_unittest.cc',
           ],
         }
       ],
     },
    ],
   ],
 }