Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 185bd43953b915422490922e28f4acfc6fbff6d1..aa55fe5f502b95da78070ab35ee15f347a36ded1 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -994,7 +994,7 @@ |
}, |
{ |
# GN version: //media/mojo/interfaces |
- 'target_name': 'mojo_media_bindings', |
+ 'target_name': 'media_mojo_bindings', |
'type': 'static_library', |
'sources': [ |
'mojo/interfaces/media_types.mojom', |
@@ -1011,31 +1011,52 @@ |
], |
}, |
{ |
- 'target_name': 'mojo_media_lib', |
+ 'target_name': 'media_mojo_lib', |
'type': 'static_library', |
+ 'includes': [ |
+ '../mojo/mojo_variables.gypi', |
+ ], |
'dependencies': [ |
'media', |
- 'mojo_media_bindings', |
+ 'media_mojo_bindings', |
'../base/base.gyp:base', |
'../mojo/mojo_base.gyp:mojo_environment_chromium', |
- # TODO(tim): We really want mojo_system_for_component here. |
- '../mojo/mojo_base.gyp:mojo_system_impl', |
+ '<(mojo_system_for_component)', |
], |
'export_dependent_settings': [ |
- 'mojo_media_bindings', |
+ 'media_mojo_bindings', |
], |
'sources': [ |
'mojo/services/media_type_converters.cc', |
'mojo/services/media_type_converters.h', |
+ 'mojo/services/mojo_renderer_client_impl.cc', |
+ 'mojo/services/mojo_renderer_client_impl.h', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'media_mojo_renderer_app', |
+ 'type': 'loadable_module', |
+ 'includes': [ |
+ '../mojo/mojo_variables.gypi', |
+ ], |
+ 'dependencies': [ |
+ '../base/base.gyp:base', |
+ '../mojo/mojo_base.gyp:mojo_application_chromium', |
+ '<(mojo_system_for_loadable_module)', |
+ 'media_mojo_lib', |
+ ], |
+ 'sources': [ |
+ 'mojo/services/mojo_renderer_service.cc', |
+ 'mojo/services/mojo_renderer_service.h', |
], |
}, |
{ |
- 'target_name': 'mojo_media_lib_unittests', |
+ 'target_name': 'media_mojo_lib_unittests', |
'type': 'executable', |
'dependencies': [ |
'media', |
- 'mojo_media_bindings', |
- 'mojo_media_lib', |
+ 'media_mojo_bindings', |
+ 'media_mojo_lib', |
'../base/base.gyp:base', |
'../base/base.gyp:test_support_base', |
'../testing/gtest.gyp:gtest', |
@@ -1047,6 +1068,15 @@ |
], |
}, |
{ |
+ 'target_name': 'media_mojo', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'media_mojo_lib', |
+ 'media_mojo_renderer_app', |
+ 'media_mojo_lib_unittests', |
+ ] |
+ }, |
+ { |
# GN version: //media:media_unittests |
'target_name': 'media_unittests', |
'type': '<(gtest_target_type)', |