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

Unified Diff: mojo/mojo.gyp

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 | « no previous file | mojo/mojo_base.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 4c9277b8dfc8f5a84e89d5ee88f7a0f525f54ccf..a8b6e11f691b2c912decff8e96ed0e415df4c9d9 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -166,7 +166,7 @@
'mojo_base.gyp:mojo_application_bindings',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_system_impl',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_external_service_bindings',
'mojo_gles2_impl',
'mojo_native_viewport_service',
@@ -367,7 +367,7 @@
'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_run_all_unittests',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_service_manager',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
@@ -457,7 +457,7 @@
'../base/base.gyp:base',
'../build/linux/system.gyp:dbus',
'../dbus/dbus.gyp:dbus',
- 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_system_impl',
'mojo_external_service_bindings',
« no previous file with comments | « no previous file | mojo/mojo_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698