Chromium Code Reviews| Index: mojo/mojo.gyp |
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp |
| index af6e853df4aa13b87db154d21def9c40c9850cf6..510075cec887691e259788224e63de1a2e426a74 100644 |
| --- a/mojo/mojo.gyp |
| +++ b/mojo/mojo.gyp |
| @@ -65,6 +65,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': [ |
| @@ -412,6 +429,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', |
| @@ -463,6 +481,18 @@ |
| 'shell/url_request_context_getter.cc', |
| 'shell/url_request_context_getter.h', |
| ], |
| + 'conditions': [ |
| + ['OS=="linux"', { |
| + 'sources': [ |
| + 'shell/dbus_service_loader.cc', |
|
DaveMoore
2014/04/22 20:39:51
It's more common in gyp files to list all files in
Chris Masone
2014/04/22 21:16:30
Done.
|
| + 'shell/dbus_service_loader.h', |
| + ], |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:dbus', |
| + '../dbus/dbus.gyp:dbus', |
| + ], |
| + }], |
| + ], |
| }, |
| { |
| 'target_name': 'mojo_shell', |