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

Unified Diff: mojo/mojo.gyp

Issue 242763003: Implement a trivial Mojo EchoService that can be connected to over DBus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to switch MojoChannelInit to ChannelInit Created 6 years, 8 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 | « mojo/examples/dbus_echo/dbus_echo_app.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 5cd9e580a9d68f487a3c59c3cf741225b598ea09..ddf77f7ccdd4d3d704d64b3ad9c12be490436152 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -75,6 +75,23 @@
]
},
{
+ 'target_name': 'mojo_external_service_bindings',
+ 'type': 'static_library',
+ 'sources': [
+ 'shell/external_service.mojom',
+ ],
+ 'variables': {
+ 'mojom_base_output_dir': 'mojo',
+ },
+ 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
+ 'export_dependent_settings': [
+ 'mojo_bindings',
+ ],
+ 'dependencies': [
+ 'mojo_bindings',
+ ],
+ },
+ {
'target_name': 'mojo_run_all_unittests',
'type': 'static_library',
'dependencies': [
@@ -423,6 +440,7 @@
'../base/base.gyp:base_static',
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
+ 'mojo_external_service_bindings',
'mojo_gles2_impl',
'mojo_service_manager',
'mojo_shell_bindings',
@@ -446,6 +464,8 @@
'shell/child_process_host.h',
'shell/context.cc',
'shell/context.h',
+ 'shell/dbus_service_loader_linux.cc',
+ 'shell/dbus_service_loader_linux.h',
'shell/dynamic_service_loader.cc',
'shell/dynamic_service_loader.h',
'shell/dynamic_service_runner.h',
@@ -474,6 +494,14 @@
'shell/url_request_context_getter.cc',
'shell/url_request_context_getter.h',
],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../dbus/dbus.gyp:dbus',
+ ],
+ }],
+ ],
},
{
'target_name': 'mojo_shell',
« no previous file with comments | « mojo/examples/dbus_echo/dbus_echo_app.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698