| Index: mojo/mojo_shell.gyp
|
| diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
|
| index 8298d8e2b742d83fdc3adc95d96c5b1c54bcf5a9..57b2b218edf04fd7b2cc42ffb59d3c3d2f9ca5df 100644
|
| --- a/mojo/mojo_shell.gyp
|
| +++ b/mojo/mojo_shell.gyp
|
| @@ -50,8 +50,8 @@
|
| 'shell/tests/capability_filter_unittest.cc',
|
| ],
|
| 'dependencies': [
|
| - '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib',
|
| - '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_test_bindings',
|
| + 'mojo_shell_lib',
|
| + 'mojo_shell_test_bindings',
|
| '<(DEPTH)/base/base.gyp:base',
|
| '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
|
| '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
|
| @@ -74,5 +74,95 @@
|
| 'includes': [
|
| 'mojom_bindings_generator_explicit.gypi',
|
| ],
|
| + }, {
|
| + 'target_name': 'mojo_runner_connection_lib',
|
| + 'type': 'static_library',
|
| + 'sources': [
|
| + 'shell/runner/child/runner_connection.cc',
|
| + 'shell/runner/child/runner_connection.h',
|
| + ],
|
| + 'dependencies': [
|
| + 'mojo_runner_common_lib',
|
| + 'mojo_runner_connection_bindings_lib',
|
| + '<(DEPTH)/base/base.gyp:base',
|
| + '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
|
| + '<(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',
|
| + ],
|
| + }, {
|
| + '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_connection_bindings_lib',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| + 'mojo_runner_connection_mojom',
|
| + ],
|
| + }, {
|
| + 'target_name': 'mojo_runner_connection_mojom',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'mojom_files': [
|
| + 'shell/runner/child/child_controller.mojom',
|
| + ],
|
| + },
|
| + 'includes': [
|
| + 'mojom_bindings_generator_explicit.gypi',
|
| + ],
|
| + 'dependencies': [
|
| + '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
|
| + ],
|
| + }, {
|
| + 'target_name': 'mojo_runner_host_lib',
|
| + 'type': 'static_library',
|
| + 'sources': [
|
| + 'shell/runner/host/child_process.cc',
|
| + 'shell/runner/host/child_process.h',
|
| + 'shell/runner/host/child_process_base.cc',
|
| + 'shell/runner/host/child_process_base.h',
|
| + 'shell/runner/host/child_process_host.cc',
|
| + 'shell/runner/host/child_process_host.h',
|
| + 'shell/runner/host/in_process_native_runner.cc',
|
| + 'shell/runner/host/in_process_native_runner.h',
|
| + 'shell/runner/host/out_of_process_native_runner.cc',
|
| + 'shell/runner/host/out_of_process_native_runner.h',
|
| + 'shell/runner/host/native_application_support.cc',
|
| + 'shell/runner/host/native_application_support.h',
|
| + 'shell/runner/init.cc',
|
| + 'shell/runner/init.h',
|
| + ],
|
| + 'dependencies': [
|
| + 'mojo_runner_common_lib',
|
| + 'mojo_runner_connection_bindings_lib',
|
| + 'mojo_shell_lib',
|
| + '<(DEPTH)/base/base.gyp:base',
|
| + '<(DEPTH)/base/base.gyp:base_i18n',
|
| + '<(DEPTH)/base/base.gyp:base_static',
|
| + '<(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',
|
| + ],
|
| + 'conditions': [
|
| + ['OS=="linux"', {
|
| + 'sources': [
|
| + 'shell/runner/host/linux_sandbox.cc',
|
| + 'shell/runner/host/linux_sandbox.h',
|
| + ],
|
| + 'dependencies': [
|
| + '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
|
| + '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services',
|
| + '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf',
|
| + '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers',
|
| + ],
|
| + }],
|
| + ],
|
| }],
|
| }
|
|
|