Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index e69544bd1abeb0a92328f4b096bcfcd716722192..4d3e76d9dbc7b656282f1ec3a8e5e66299e12c28 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -1069,6 +1069,87 @@ |
| ], # target_conditions |
| }, |
| { |
| + # GN version: //media/mojo/interfaces |
|
xhwang
2014/12/15 21:32:30
Sigh.... These are brought back because content/br
|
| + 'target_name': 'media_mojo_bindings', |
| + 'type': 'static_library', |
| + 'sources': [ |
| + 'mojo/interfaces/media_types.mojom', |
| + 'mojo/interfaces/media_renderer.mojom', |
| + 'mojo/interfaces/demuxer_stream.mojom', |
| + ], |
| + 'includes': [ |
| + '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' |
| + ], |
| + 'export_dependent_settings': [ |
| + '../mojo/public/mojo_public.gyp:mojo_cpp_bindings', |
| + '../mojo/services/public/mojo_services_public.gyp:mojo_geometry_bindings', |
| + ], |
| + 'dependencies': [ |
| + '../mojo/public/mojo_public.gyp:mojo_cpp_bindings', |
| + '../mojo/services/public/mojo_services_public.gyp:mojo_geometry_bindings', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'media_mojo_renderer_proxy', |
| + 'type': 'static_library', |
| + 'includes': [ |
| + '../mojo/mojo_variables.gypi', |
| + ], |
| + 'dependencies': [ |
| + 'media', |
| + 'media_mojo_bindings', |
| + '../base/base.gyp:base', |
| + '../mojo/mojo_geometry_converters.gyp:mojo_geometry_lib', |
| + '../skia/skia.gyp:skia', |
| + '../ui/gfx/gfx.gyp:gfx_geometry', |
| + '<(mojo_system_for_component)', |
| + ], |
| + 'export_dependent_settings': [ |
| + 'media_mojo_bindings', |
| + ], |
| + 'sources': [ |
| + 'mojo/services/media_type_converters.cc', |
| + 'mojo/services/media_type_converters.h', |
| + 'mojo/services/mojo_demuxer_stream_impl.cc', |
| + 'mojo/services/mojo_demuxer_stream_impl.h', |
| + "mojo/services/mojo_renderer_factory.cc", |
| + "mojo/services/mojo_renderer_factory.h", |
| + 'mojo/services/mojo_renderer_impl.cc', |
| + 'mojo/services/mojo_renderer_impl.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'media_mojo_renderer_service', |
| + 'type': '<(component)', |
| + 'includes': [ |
| + '../mojo/mojo_variables.gypi', |
| + ], |
| + 'defines': [ |
| + 'MEDIA_IMPLEMENTATION', |
| + ], |
| + 'dependencies': [ |
| + '../base/base.gyp:base', |
| + 'media_mojo_bindings', |
| + 'shared_memory_support', |
| + '../mojo/mojo_base.gyp:mojo_environment_chromium', |
| + '<(mojo_system_for_component)', |
| + '../skia/skia.gyp:skia', |
| + ], |
| + 'sources': [ |
| + 'mojo/services/demuxer_stream_provider_shim.cc', |
| + 'mojo/services/demuxer_stream_provider_shim.h', |
| + 'mojo/services/media_type_converters.cc', |
| + 'mojo/services/media_type_converters.h', |
| + 'mojo/services/mojo_demuxer_stream_adapter.cc', |
| + 'mojo/services/mojo_demuxer_stream_adapter.h', |
| + 'mojo/services/mojo_renderer_service.cc', |
| + 'mojo/services/mojo_renderer_service.h', |
| + 'mojo/services/renderer_config.cc', |
| + 'mojo/services/renderer_config.h', |
| + 'mojo/services/renderer_config_default.cc', |
| + ], |
| + }, |
| + { |
| # GN version: //media:media_unittests |
| 'target_name': 'media_unittests', |
| 'type': '<(gtest_target_type)', |