Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(769)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 518163003: media: scaffolding and plumbing for MojoRenderer{Impl, Service} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@medr
Patch Set: add test Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/mojo/interfaces/demuxer_stream.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 5fb0366a4c35a18a9622b3f3fb3c0d1e3c8033eb..1ba9ea4149ceef1f4991d2878c1db4b5ef4f8236 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1003,62 +1003,6 @@
], # target_conditions
},
{
- # GN version: //media/mojo/interfaces
- 'target_name': 'mojo_media_bindings',
- 'type': 'static_library',
- 'sources': [
- 'mojo/interfaces/media_types.mojom',
- 'mojo/interfaces/media_renderer.mojom',
- ],
- 'includes': [
- '../mojo/public/tools/bindings/mojom_bindings_generator.gypi'
- ],
- 'export_dependent_settings': [
- '../mojo/mojo_base.gyp:mojo_cpp_bindings',
- ],
- 'dependencies': [
- '../mojo/mojo_base.gyp:mojo_cpp_bindings',
- ],
- },
- {
- 'target_name': 'mojo_media_lib',
- 'type': 'static_library',
- 'includes': [
- '../mojo/mojo_variables.gypi',
- ],
- 'dependencies': [
- 'media',
- 'mojo_media_bindings',
- '../base/base.gyp:base',
- '../mojo/mojo_base.gyp:mojo_environment_chromium',
- '<(mojo_system_for_component)',
- ],
- 'export_dependent_settings': [
- 'mojo_media_bindings',
- ],
- 'sources': [
- 'mojo/services/media_type_converters.cc',
- 'mojo/services/media_type_converters.h',
- ],
- },
- {
- 'target_name': 'mojo_media_lib_unittests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- 'media',
- 'mojo_media_bindings',
- 'mojo_media_lib',
- '../base/base.gyp:base',
- '../base/base.gyp:test_support_base',
- '../testing/gtest.gyp:gtest',
- '../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/mojo_base.gyp:mojo_run_all_unittests',
- ],
- 'sources': [
- 'mojo/services/media_type_converters_unittest.cc',
- ],
- },
- {
# GN version: //media:media_unittests
'target_name': 'media_unittests',
'type': '<(gtest_target_type)',
@@ -1799,5 +1743,124 @@
},
],
}],
+ ['OS=="linux"', {
+ 'targets': [
+ {
+ # GN version: //media/mojo/interfaces
+ '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/mojo_base.gyp:mojo_cpp_bindings',
+ ],
+ 'dependencies': [
+ '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+ ],
+ },
+ {
+ 'target_name': 'media_mojo_lib',
+ 'type': 'static_library',
+ 'includes': [
+ '../mojo/mojo_variables.gypi',
+ ],
+ 'dependencies': [
+ 'media',
+ 'media_mojo_bindings',
+ '../base/base.gyp:base',
+ '../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '<(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_impl.cc',
+ 'mojo/services/mojo_renderer_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_demuxer_stream_adapter.cc',
+ 'mojo/services/mojo_demuxer_stream_adapter.h',
+ 'mojo/services/mojo_renderer_service.cc',
+ 'mojo/services/mojo_renderer_service.h',
+ ],
+ },
+ {
+ 'target_name': 'media_mojo_lib_unittests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ 'media',
+ 'media_mojo_bindings',
+ 'media_mojo_lib',
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../testing/gtest.gyp:gtest',
+ '../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_base.gyp:mojo_run_all_unittests',
+ ],
+ 'sources': [
+ 'mojo/services/media_type_converters_unittest.cc',
+ ],
+ },
+ {
+ 'target_name': 'media_mojo_renderer_apptest',
+ 'type': 'loadable_module',
+ 'includes': [
+ '../mojo/mojo_variables.gypi',
+ ],
+ 'dependencies': [
+ 'media',
+ 'media_mojo_bindings',
+ 'media_mojo_lib',
+ 'media_mojo_renderer_app',
+ 'media_test_support',
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ '../testing/gtest.gyp:gtest',
+ '../mojo/mojo_base.gyp:mojo_application_chromium',
+ # These tests are run via mojo_shell, so declare a dependency to
+ # avoid undefined behavior.
+ '../mojo/mojo.gyp:mojo_shell',
+ '<(mojo_system_for_loadable_module)',
+ ],
+ 'sources': [
+ 'mojo/services/renderer_unittest.cc',
+ ],
+ },
+ {
+ 'target_name': 'media_mojo',
+ 'type': 'none',
+ 'dependencies': [
+ 'media_mojo_lib',
+ 'media_mojo_lib_unittests',
+ 'media_mojo_renderer_app',
+ 'media_mojo_renderer_apptest',
+ ]
+ },
+ ]
+ }],
],
}
« no previous file with comments | « no previous file | media/mojo/interfaces/demuxer_stream.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698