Index: mojo/mojo_shell.gyp |
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp |
index 9e2e5ee90c5ff5b400e8d1d072bb2c68c5fb0161..0b95228d76b4d2fef27855c90c5b6713b120d5d7 100644 |
--- a/mojo/mojo_shell.gyp |
+++ b/mojo/mojo_shell.gyp |
@@ -74,35 +74,28 @@ |
'mojom_bindings_generator_explicit.gypi', |
], |
}, { |
- 'target_name': 'mojo_runner_connection_lib', |
+ 'target_name': 'mojo_runner_common_lib', |
'type': 'static_library', |
'sources': [ |
- 'shell/runner/child/runner_connection.cc', |
- 'shell/runner/child/runner_connection.h', |
+ 'shell/runner/common/client_util.cc', |
+ 'shell/runner/common/client_util.h', |
+ 'shell/runner/common/switches.cc', |
+ 'shell/runner/common/switches.h', |
+ ], |
+ 'include_dirs': [ |
+ '..', |
], |
'dependencies': [ |
- 'mojo_runner_common_lib', |
'<(DEPTH)/base/base.gyp:base', |
- '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base', |
'<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings', |
'<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl', |
- '<(DEPTH)/mojo/mojo_platform_handle.gyp:platform_handle', |
- '<(DEPTH)/mojo/mojo_public.gyp:mojo_message_pump_lib', |
+ '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings', |
+ '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_system', |
], |
'export_dependent_settings': [ |
'<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings', |
], |
}, { |
- 'target_name': 'mojo_runner_common_lib', |
- 'type': 'static_library', |
- 'sources': [ |
- 'shell/runner/common/switches.cc', |
- 'shell/runner/common/switches.h', |
- ], |
- 'include_dirs': [ |
- '..', |
- ], |
- }, { |
'target_name': 'mojo_runner_host_lib', |
'type': 'static_library', |
'sources': [ |