Revert 87790 - Removing defunct OpenMAX code.

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'player_x11_renderer%': 'x11',
   },
   'targets': [
     {
       'target_name': 'media',
       'type': 'static_library',
       'dependencies': [
         'yuv_convert',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-        '../third_party/openmax/openmax.gyp:il',
       ],
       'include_dirs': [
         '..',
       ],
       'msvs_guid': '6AE76406-B03B-11DD-94B1-80B556D89593',
       'sources': [
         'audio/audio_buffers_state.cc',
         'audio/audio_buffers_state.h',
         'audio/audio_io.h',
         'audio/audio_input_controller.cc',
@@ skipping 187 matching lines @@
             ],
           },
         }],
         ['OS!="openbsd"', {
           'sources!': [
             'audio/openbsd/audio_manager_openbsd.cc',
             'audio/openbsd/audio_manager_openbsd.h',
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
+          'sources': [
+            'filters/omx_video_decoder.cc',
+            'filters/omx_video_decoder.h',
+          ],
+          'dependencies': [
+            'omx_wrapper',
+          ]
+        }],
+        ['os_posix == 1 and OS != "mac"', {
           'sources!': [
             'video/capture/video_capture_device_dummy.cc',
             'video/capture/video_capture_device_dummy.h',
           ],
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
@@ skipping 123 matching lines @@
       'dependencies': [
         'media',
         'media_test_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+        '../third_party/openmax/openmax.gyp:il',
+      ],
+      'sources!': [
+        '../third_party/openmax/omx_stub.cc',
       ],
       'sources': [
         'audio/audio_input_controller_unittest.cc',
         'audio/audio_input_device_unittest.cc',
         'audio/audio_input_unittest.cc',
         'audio/audio_output_controller_unittest.cc',
         'audio/audio_output_proxy_unittest.cc',
         'audio/audio_parameters_unittest.cc',
         'audio/audio_util_unittest.cc',
         'audio/linux/alsa_output_unittest.cc',
@@ skipping 25 matching lines @@
         'filters/audio_renderer_base_unittest.cc',
         'filters/bitstream_converter_unittest.cc',
         'filters/decoder_base_unittest.cc',
         'filters/ffmpeg_demuxer_unittest.cc',
         'filters/ffmpeg_glue_unittest.cc',
         'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
         'filters/ffmpeg_video_decoder_unittest.cc',
         'filters/file_data_source_unittest.cc',
         'filters/rtc_video_decoder_unittest.cc',
         'filters/video_renderer_base_unittest.cc',
+        'omx/mock_omx.cc',
+        'omx/mock_omx.h',
         'video/ffmpeg_video_decode_engine_unittest.cc',
       ],
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            # Needed for the following #include chain:
+            #   base/run_all_unittests.cc
+            #   ../base/test_suite.h
+            #   gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
+          'sources': [
+            'omx/omx_codec_unittest.cc',
+          ],
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'media_test_support',
       'type': 'static_library',
       'dependencies': [
         'media',
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
@@ skipping 206 matching lines @@
           ],
           'sources': [
             'tools/tile_render_bench/tile_render_bench.cc',
           ],
         },
       ],
     }],
     ['os_posix == 1 and OS != "mac"', {
       'targets': [
         {
+          'target_name': 'omx_test',
+          'type': 'executable',
+          'dependencies': [
+            'media',
+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+            '../third_party/openmax/openmax.gyp:il',
+          ],
+          'sources': [
+            'tools/omx_test/color_space_util.cc',
+            'tools/omx_test/color_space_util.h',
+            'tools/omx_test/file_reader_util.cc',
+            'tools/omx_test/file_reader_util.h',
+            'tools/omx_test/file_sink.cc',
+            'tools/omx_test/file_sink.h',
+            'tools/omx_test/omx_test.cc',
+          ],
+        },
+        {
+          'target_name': 'omx_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'media',
+            'omx_wrapper',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'conditions': [
+            ['toolkit_uses_gtk == 1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+          ],
+          'sources': [
+            'omx/omx_unittest.cc',
+            'omx/run_all_unittests.cc',
+          ],
+        },
+        {
+          'target_name': 'omx_wrapper',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../third_party/openmax/openmax.gyp:il',
+            # TODO(wjia): remove ffmpeg
+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+          ],
+          'sources': [
+            'omx/omx_configurator.cc',
+            'omx/omx_configurator.h',
+            'video/omx_video_decode_engine.cc',
+            'video/omx_video_decode_engine.cc',
+          ],
+          'hard_dependency': 1,
+          'export_dependent_settings': [
+            '../third_party/openmax/openmax.gyp:il',
+          ],
+        },
+        {
           'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
             '../base/base.gyp:base',
           ],
           'link_settings': {
             'libraries': [
               '-ldl',
               '-lX11',
@@ skipping 44 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: