Chromium Code Reviews| Index: media/BUILD.gn |
| diff --git a/media/BUILD.gn b/media/BUILD.gn |
| index 628aa06e15b38955bc72eeebc9d4da011dd91028..5e10bbdf78aa26d7ca5e2ae4c4cd6a63f9619788 100644 |
| --- a/media/BUILD.gn |
| +++ b/media/BUILD.gn |
| @@ -122,8 +122,6 @@ component("media") { |
| "filters/frame_processor.h", |
| "filters/gpu_video_accelerator_factories.cc", |
| "filters/gpu_video_accelerator_factories.h", |
| - "filters/gpu_video_decoder.cc", |
| - "filters/gpu_video_decoder.h", |
| "filters/h264_bit_reader.cc", |
| "filters/h264_bit_reader.h", |
| "filters/h264_parser.cc", |
| @@ -132,8 +130,6 @@ component("media") { |
| "filters/jpeg_parser.h", |
| "filters/renderer_impl.cc", |
| "filters/renderer_impl.h", |
| - "filters/skcanvas_video_renderer.cc", |
| - "filters/skcanvas_video_renderer.h", |
| "filters/source_buffer_platform.cc", |
| "filters/source_buffer_platform.h", |
| "filters/source_buffer_range.cc", |
| @@ -178,16 +174,8 @@ component("media") { |
| "midi/usb_midi_jack.h", |
| "midi/usb_midi_output_stream.cc", |
| "midi/usb_midi_output_stream.h", |
| - "video/capture/fake_video_capture_device.cc", |
| - "video/capture/fake_video_capture_device.h", |
| - "video/capture/fake_video_capture_device_factory.h", |
| - "video/capture/fake_video_capture_device_factory.cc", |
| "video/capture/file_video_capture_device.cc", |
| "video/capture/file_video_capture_device.h", |
| - "video/capture/file_video_capture_device_factory.h", |
| - "video/capture/file_video_capture_device_factory.cc", |
| - "video/capture/linux/video_capture_device_factory_linux.cc", |
| - "video/capture/linux/video_capture_device_factory_linux.h", |
| "video/capture/linux/video_capture_device_linux.cc", |
| "video/capture/linux/video_capture_device_linux.h", |
| "video/capture/linux/video_capture_device_chromeos.cc", |
| @@ -205,8 +193,6 @@ component("media") { |
| "video/capture/mac/video_capture_device_qtkit_mac.mm", |
| "video/capture/video_capture_device.cc", |
| "video/capture/video_capture_device.h", |
| - "video/capture/video_capture_device_factory.cc", |
| - "video/capture/video_capture_device_factory.h", |
| "video/capture/video_capture_device_info.cc", |
| "video/capture/video_capture_device_info.h", |
| "video/capture/video_capture_types.cc", |
| @@ -320,11 +306,15 @@ component("media") { |
| if (!is_android) { |
| sources += [ |
| - "filters/default_renderer_factory.cc", |
| - "filters/default_renderer_factory.h", |
| "filters/opus_audio_decoder.cc", |
| "filters/opus_audio_decoder.h", |
| ] |
| + if (!is_ensemble) { |
|
DaleCurtis
2015/02/12 02:33:42
Why nest?
wtc
2015/02/12 15:20:31
In the original code, "filters/opus_audio_decoder.
DaleCurtis
2015/02/12 19:19:12
I see. What you have is fine then.
|
| + sources += [ |
| + "filters/default_renderer_factory.cc", |
| + "filters/default_renderer_factory.h", |
| + ] |
| + } |
| } else { |
| sources += [ |
| "midi/midi_manager_android.cc", |
| @@ -480,14 +470,38 @@ component("media") { |
| "//crypto", |
| "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings |
| "//gpu/command_buffer/common", |
| - "//skia", |
| "//third_party/libyuv", |
| "//third_party/opus", |
| - "//ui/events:events_base", |
| - "//ui/gfx", |
| "//ui/gfx/geometry", |
| "//url", |
| ] |
| + |
| + # Add source files and dependencies that need X11, font, or graphics |
| + # libraries. |
| + if (!is_ensemble) { |
| + sources += [ |
| + "filters/gpu_video_decoder.cc", |
| + "filters/gpu_video_decoder.h", |
| + "filters/skcanvas_video_renderer.cc", |
| + "filters/skcanvas_video_renderer.h", |
| + "video/capture/fake_video_capture_device.cc", |
| + "video/capture/fake_video_capture_device.h", |
| + "video/capture/fake_video_capture_device_factory.cc", |
| + "video/capture/fake_video_capture_device_factory.h", |
| + "video/capture/file_video_capture_device_factory.cc", |
| + "video/capture/file_video_capture_device_factory.h", |
| + "video/capture/linux/video_capture_device_factory_linux.cc", |
| + "video/capture/linux/video_capture_device_factory_linux.h", |
| + "video/capture/video_capture_device_factory.cc", |
| + "video/capture/video_capture_device_factory.h", |
| + ] |
| + |
| + deps += [ |
| + "//skia", |
| + "//ui/events:events_base", |
| + "//ui/gfx", |
| + ] |
| + } |
| } |
| # Minimal media component for media/cast on iOS. |