Revert r95841 due to failing media_unittests on linux_shared bot.

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,
   },
   'targets': [
     {
       'target_name': 'media',
-      'type': '<(component)',
+      'type': 'static_library',
       'dependencies': [
         'yuv_convert',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '../third_party/openmax/openmax.gyp:il',
-        '../ui/ui.gyp:ui',
-      ],
-      'defines': [
-        'MEDIA_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'audio/audio_buffers_state.cc',
         'audio/audio_buffers_state.h',
         'audio/audio_io.h',
         'audio/audio_input_controller.cc',
         'audio/audio_input_controller.h',
@@ skipping 67 matching lines @@
         'base/filter_collection.cc',
         'base/filter_collection.h',
         'base/filter_factories.cc',
         'base/filter_factories.h',
         'base/filter_host.h',
         'base/filters.cc',
         'base/filters.h',
         'base/h264_bitstream_converter.cc',
         'base/h264_bitstream_converter.h',
         'base/media.h',
-        'base/media_export.h',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
         'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
         'base/media_win.cc',
         'base/message_loop_factory.cc',
         'base/message_loop_factory.h',
         'base/message_loop_factory_impl.cc',
@@ skipping 268 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'media_unittests',
       'type': 'executable',
       'dependencies': [
         'media',
         'media_test_support',
-        'yuv_convert',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
         'audio/audio_input_controller_unittest.cc',
         'audio/audio_input_device_unittest.cc',
@@ skipping 88 matching lines @@
       ],
       'sources': [
         'tools/media_bench/media_bench.cc',
       ],
     },
     {
       'target_name': 'scaler_bench',
       'type': 'executable',
       'dependencies': [
         'media',
-        'yuv_convert',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
       ],
       'sources': [
         'tools/scaler_bench/scaler_bench.cc',
       ],
     },
     {
       'target_name': 'ffmpeg_tests',
       'type': 'executable',
@@ skipping 26 matching lines @@
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'player_wtl',
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
             'tools/player_wtl/list.h',
             'tools/player_wtl/mainfrm.h',
             'tools/player_wtl/movie.cc',
             'tools/player_wtl/movie.h',
             'tools/player_wtl/player_wtl.cc',
@@ skipping 31 matching lines @@
             'VCLinkerTool': {
               'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
             },
           },
         },
         {
           'target_name': 'mfdecoder',
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'tools/mfdecoder/main.cc',
             'tools/mfdecoder/mfdecoder.h',
             'tools/mfdecoder/mfdecoder.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
             },
           },
         },
       ],
     }],
     ['OS!="mac"', {
       'targets': [
         {
           'target_name': 'shader_bench',
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gfx/gl/gl.gyp:gl',
           ],
           'sources': [
             'tools/shader_bench/shader_bench.cc',
             'tools/shader_bench/cpu_color_painter.cc',
             'tools/shader_bench/cpu_color_painter.h',
             'tools/shader_bench/gpu_color_painter.cc',
             'tools/shader_bench/gpu_color_painter.h',
             'tools/shader_bench/gpu_color_painter_exp.cc',
@@ skipping 46 matching lines @@
         },
       ],
     }],
     ['os_posix == 1 and OS != "mac"', {
       'targets': [
         {
           'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gfx/gl/gl.gyp:gl',
           ],
           'link_settings': {
             'libraries': [
               '-ldl',
               '-lX11',
               '-lXrender',
               '-lXext',
             ],
           },
           'sources': [
             'tools/player_x11/gl_video_renderer.cc',
             'tools/player_x11/gl_video_renderer.h',
             'tools/player_x11/player_x11.cc',
             'tools/player_x11/x11_video_renderer.cc',
             'tools/player_x11/x11_video_renderer.h',
           ],
         },
       ],
     }],
   ],
 }