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

Unified Diff: mojo/mojo_services.gypi

Issue 394903005: mojo: terminate apps if the shell goes away (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable tests that touch nss for now Created 6 years, 4 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/mojo_public_tests.gypi ('k') | mojo/public/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index de07a71651fc294a050c7e311d971e6a6e53909d..3e07f8e034055354392eb999e495e62c1bbbc477 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -32,7 +32,7 @@
'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_utility',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
@@ -303,7 +303,7 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2_service',
@@ -392,7 +392,7 @@
'../url/url.gyp:url_lib',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_network_bindings',
],
'export_dependent_settings': [
@@ -434,7 +434,7 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_system_impl',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_cc_support',
'mojo_geometry_bindings',
'mojo_geometry_lib',
@@ -483,7 +483,7 @@
'../url/url.gyp:url_lib',
'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_launcher_bindings',
'mojo_network_bindings',
'<(mojo_system_for_loadable_module)',
@@ -521,7 +521,7 @@
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_base.gyp:mojo_application_bindings',
'mojo_geometry_bindings',
'mojo_geometry_lib',
@@ -629,7 +629,7 @@
'../base/base.gyp:base',
'mojo_base.gyp:mojo_environment_standalone',
'mojo_base.gyp:mojo_utility',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_standalone',
'mojo_test_service_bindings',
'<(mojo_system_for_loadable_module)',
],
@@ -653,7 +653,7 @@
'../base/base.gyp:base',
'mojo_base.gyp:mojo_environment_standalone',
'mojo_base.gyp:mojo_utility',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_standalone',
'mojo_test_service_bindings',
'<(mojo_system_for_loadable_module)',
],
@@ -707,7 +707,7 @@
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_cc_support',
'mojo_geometry_bindings',
'mojo_geometry_lib',
@@ -797,7 +797,7 @@
'../ui/gl/gl.gyp:gl',
'mojo_base.gyp:mojo_system_impl',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_bindings',
@@ -832,7 +832,7 @@
'../ui/wm/wm.gyp:wm',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_aura_support',
'mojo_core_window_manager_bindings',
'mojo_view_manager_lib',
@@ -903,7 +903,7 @@
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_system_impl',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_dbus_service',
'mojo_echo_bindings',
],
« no previous file with comments | « mojo/mojo_public_tests.gypi ('k') | mojo/public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698