Revert 287680 "mojo: terminate apps if the shell goes away"

trunk/src/mojo/mojo_services.gypi

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //mojo/services/dbus_echo:bindings
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
@@ skipping 14 matching lines @@
       'dependencies': [
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/native_theme/native_theme.gyp:native_theme',
         '../url/url.gyp:url_lib',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_utility',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_navigation_bindings',
         'mojo_network_bindings',
         'mojo_launcher_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
       'include_dirs': [
         'third_party/WebKit'
       ],
       'sources': [
@@ skipping 250 matching lines @@
       'target_name': 'mojo_native_viewport_service',
       # This is linked directly into the embedder, so we make it a component.
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2_service',
         'mojo_input_events_lib',
         'mojo_native_viewport_bindings',
         '<(mojo_system_for_component)',
       ],
       'defines': [
         'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',
       ],
@@ skipping 68 matching lines @@
     {
       # GN version: //mojo/services/network
       'target_name': 'mojo_network_service_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_network_bindings',
       ],
       'export_dependent_settings': [
         'mojo_network_bindings',
       ],
       'sources': [
         'services/network/cookie_store_impl.cc',
         'services/network/cookie_store_impl.h',
         'services/network/network_context.cc',
         'services/network/network_context.h',
@@ skipping 21 matching lines @@
     {
       'target_name': 'mojo_surfaces_service',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_system_impl',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_cc_support',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2',
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'services/surfaces/surfaces_impl.cc',
@@ skipping 28 matching lines @@
       ],
     },
     {
       'target_name': 'mojo_launcher',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../url/url.gyp:url_lib',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_launcher_bindings',
         'mojo_network_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'services/launcher/launcher.cc',
         'public/cpp/application/lib/mojo_main_chromium.cc',
       ],
     },
     {
@@ skipping 17 matching lines @@
     {
       # GN version: //mojo/services/public/cpp/view_manager
       'target_name': 'mojo_view_manager_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_view_manager_bindings',
         'mojo_view_manager_common',
       ],
       'sources': [
         'services/public/cpp/view_manager/lib/node.cc',
         'services/public/cpp/view_manager/lib/node_observer.cc',
         'services/public/cpp/view_manager/lib/node_private.cc',
@@ skipping 87 matching lines @@
       ],
     },
     {
       # GN version: //mojo/services/test_service
       'target_name': 'mojo_test_app',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_test_service_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'public/cpp/application/lib/mojo_main_standalone.cc',
         'services/test_service/test_request_tracker_client_impl.cc',
         'services/test_service/test_request_tracker_client_impl.h',
         'services/test_service/test_service_application.cc',
         'services/test_service/test_service_application.h',
         'services/test_service/test_service_impl.cc',
         'services/test_service/test_service_impl.h',
         'services/test_service/test_time_service_impl.cc',
         'services/test_service/test_time_service_impl.h',
       ],
     },
     {
       # GN version: //mojo/services/test_service:request_tracker
       'target_name': 'mojo_test_request_tracker_app',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_test_service_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'public/cpp/application/lib/mojo_main_standalone.cc',
         'services/test_service/test_request_tracker_client_impl.cc',
         'services/test_service/test_request_tracker_client_impl.h',
         'services/test_service/test_request_tracker_application.cc',
         'services/test_service/test_request_tracker_application.h',
         'services/test_service/test_time_service_impl.cc',
@@ skipping 33 matching lines @@
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../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_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_cc_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_gles2',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_native_viewport_bindings',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
             '<(mojo_system_for_component)',
@@ skipping 69 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_environment_chromium',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_service_manager',
             'mojo_shell_test_support',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
             'mojo_view_manager_run_unittests',
           ],
@@ skipping 14 matching lines @@
           'target_name': 'mojo_core_window_manager_lib',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/wm/wm.gyp:wm',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_aura_support',
             'mojo_core_window_manager_bindings',
             'mojo_view_manager_lib',
           ],
           'sources': [
             'services/window_manager/window_manager_app.cc',
             'services/window_manager/window_manager_app.h',
             'services/window_manager/window_manager_service_impl.cc',
             'services/window_manager/window_manager_service_impl.h',
           ],
@@ skipping 50 matching lines @@
         {
           'target_name': 'mojo_dbus_echo_service',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_system_impl',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_dbus_service',
             'mojo_echo_bindings',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }