Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index 94ae88909613c151c27565e053f7f7391db76f60..c47ac97a0cfa0e4ae651ed4bc5a8af0a9826b231 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -11,6 +11,9 @@ |
| # (DT_NEEDED) instead of using dlopen. This helps with automated |
| # detection of ABI mismatches and prevents silent errors. |
| 'linux_link_pulseaudio%': 0, |
| + # Override to omit code that depends on the X11, font, and graphics |
| + # libraries. |
| + 'is_ensemble%': 0, |
| 'conditions': [ |
| ['OS=="android" or OS=="ios"', { |
| # Android and iOS don't use ffmpeg or libvpx. |
| @@ -62,11 +65,8 @@ |
| '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| '../crypto/crypto.gyp:crypto', |
| '../gpu/gpu.gyp:command_buffer_common', |
| - '../skia/skia.gyp:skia', |
| '../third_party/libyuv/libyuv.gyp:libyuv', |
| '../third_party/opus/opus.gyp:opus', |
| - '../ui/events/events.gyp:events_base', |
| - '../ui/gfx/gfx.gyp:gfx', |
| '../ui/gfx/gfx.gyp:gfx_geometry', |
| '../url/url.gyp:url_lib', |
| 'shared_memory_support', |
| @@ -455,8 +455,6 @@ |
| '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', |
| @@ -469,8 +467,6 @@ |
| 'filters/opus_audio_decoder.h', |
| 'filters/renderer_impl.cc', |
| 'filters/renderer_impl.h', |
| - 'filters/skcanvas_video_renderer.cc', |
| - 'filters/skcanvas_video_renderer.h', |
| 'filters/source_buffer_range.cc', |
| 'filters/source_buffer_range.h', |
| 'filters/source_buffer_stream.cc', |
| @@ -528,16 +524,8 @@ |
| 'video/capture/android/video_capture_device_android.h', |
| 'video/capture/android/video_capture_device_factory_android.cc', |
| 'video/capture/android/video_capture_device_factory_android.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', |
| @@ -555,8 +543,6 @@ |
| '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', |
| @@ -621,6 +607,37 @@ |
| ], |
| }, |
| 'conditions': [ |
| + ['is_ensemble==0', { |
| + # Add the sources and dependencies that need X11, font, or graphics |
| + # libraries. |
| + 'dependencies': [ |
| + '../skia/skia.gyp:skia', |
| + '../ui/events/events.gyp:events_base', |
| + '../ui/gfx/gfx.gyp:gfx', |
| + ], |
| + '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', |
| + ], |
| + }, { # is_ensemble==1 |
| + # Exclude the sources that need X11, font, or graphics libraries. |
| + 'sources!': [ |
| + 'filters/default_renderer_factory.cc', |
| + 'filters/default_renderer_factory.h', |
|
wtc
2015/02/12 02:17:45
These two files are excluded rather than added bec
|
| + ], |
| + }], |
| ['arm_neon==1', { |
| 'defines': [ |
| 'USE_NEON' |
| @@ -756,7 +773,7 @@ |
| }], |
| ['OS=="linux"', { |
| 'conditions': [ |
| - ['use_x11==1', { |
| + ['use_x11==1 and is_ensemble==0', { |
| 'dependencies': [ |
| '../build/linux/system.gyp:x11', |
| '../build/linux/system.gyp:xdamage', |
| @@ -765,7 +782,7 @@ |
| '../build/linux/system.gyp:xtst', |
| '../ui/gfx/x/gfx_x11.gyp:gfx_x11', |
| ], |
| - }, { # else: use_x11==0 |
| + }, { # else: use_x11==0 or is_ensemble==1 |
| 'sources!': [ |
| 'base/user_input_monitor_linux.cc', |
| ], |