diff options
| author | rockot <rockot@chromium.org> | 2016-03-14 16:38:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 23:40:38 +0000 |
| commit | d5669c5cce5e182f29a4387807cda0c74e8265eb (patch) | |
| tree | 40ca09f1547e7ec5e5afbb193854cdd27d52b1b3 /mojo/mojo_shell.gyp | |
| parent | 1afe4c3c566b3270b346c86f7698086e85b93730 (diff) | |
| download | chromium_src-d5669c5cce5e182f29a4387807cda0c74e8265eb.zip chromium_src-d5669c5cce5e182f29a4387807cda0c74e8265eb.tar.gz chromium_src-d5669c5cce5e182f29a4387807cda0c74e8265eb.tar.bz2 | |
Change primordial pipes to ShellClient
Changes shell client startup pipes to be ShellClient instead
of ShellClientFactory. This simplifies a lot of startup code.
Due to this change, apps must now take responsibility for
shutting themselves down when they feel it's appropriate. For
now, all relevant apps are force-exited to mimic the old
behavior.
Once apptests are deleted, we should expose a clean quit
closure to apps so they have something to run when they want
to quit. Hard-exiting the process is definitely not the right
thing to do.
BUG=
Review URL: https://codereview.chromium.org/1801963002
Cr-Commit-Position: refs/heads/master@{#381114}
Diffstat (limited to 'mojo/mojo_shell.gyp')
| -rw-r--r-- | mojo/mojo_shell.gyp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp index 9e2e5ee..0b95228 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': [ |