| Index: mojo/mojo_examples.gypi
|
| diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
|
| index 81b0a4fc4ab29e0dcb9503205f3995002696aafe..e9f8e6c75e0d62085cbc1aed7c556702268df4ed 100644
|
| --- a/mojo/mojo_examples.gypi
|
| +++ b/mojo/mojo_examples.gypi
|
| @@ -10,14 +10,12 @@
|
| 'dependencies': [
|
| 'mojo_base.gyp:mojo_application_standalone',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_standalone',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_echo_service_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/echo/echo_client.cc',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| {
|
| @@ -47,14 +45,12 @@
|
| 'dependencies': [
|
| 'mojo_base.gyp:mojo_application_standalone',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_standalone',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_echo_service_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/echo/echo_service.cc',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| {
|
| @@ -73,7 +69,6 @@
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| 'mojo_base.gyp:mojo_application_standalone',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_standalone',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_geometry_bindings',
|
| 'mojo_native_viewport_bindings',
|
| @@ -86,7 +81,6 @@
|
| 'examples/sample_app/sample_app.cc',
|
| 'examples/sample_app/spinning_cube.cc',
|
| 'examples/sample_app/spinning_cube.h',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| {
|
| @@ -116,7 +110,6 @@
|
| 'dependencies': [
|
| 'mojo_base.gyp:mojo_application_standalone', # For ApplicationDelegate.
|
| 'mojo_base.gyp:mojo_cpp_bindings', # For *.mojom.h
|
| - 'mojo_base.gyp:mojo_environment_standalone', # For Environment.
|
| 'mojo_example_service_bindings',
|
| 'mojo_base.gyp:mojo_utility', # For RunLoop.
|
| '<(mojo_system_for_loadable_module)',
|
| @@ -126,7 +119,6 @@
|
| 'examples/apptest/example_service_application.h',
|
| 'examples/apptest/example_service_impl.cc',
|
| 'examples/apptest/example_service_impl.h',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| {
|
| @@ -135,7 +127,6 @@
|
| 'dependencies': [
|
| '../testing/gtest.gyp:gtest',
|
| 'mojo_base.gyp:mojo_application_standalone', # For ApplicationDelegate.
|
| - 'mojo_base.gyp:mojo_environment_standalone', # For Environment.
|
| 'mojo_example_service',
|
| 'mojo_example_service_bindings',
|
| 'mojo_base.gyp:mojo_utility', # For RunLoop.
|
| @@ -166,7 +157,6 @@
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_cc_support',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -178,7 +168,6 @@
|
| 'examples/compositor_app/compositor_app.cc',
|
| 'examples/compositor_app/compositor_host.cc',
|
| 'examples/compositor_app/compositor_host.h',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -194,14 +183,12 @@
|
| 'dependencies': [
|
| 'mojo_base.gyp:mojo_application_standalone',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_standalone',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_network_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/wget/wget.cc',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| {
|
| @@ -210,14 +197,12 @@
|
| 'dependencies': [
|
| 'mojo_base.gyp:mojo_application_standalone',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_standalone',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_content_handler_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/content_handler_demo/content_handler_demo.cc',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| {
|
| @@ -249,7 +234,6 @@
|
| '../ui/gfx/gfx.gyp:gfx',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_media_viewer_bindings',
|
| 'mojo_navigation_bindings',
|
| @@ -260,7 +244,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/png_viewer/png_viewer.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -275,7 +258,6 @@
|
| '../ui/events/events.gyp:events_base',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_geometry_bindings',
|
| 'mojo_native_viewport_bindings',
|
| '<(mojo_gles2_for_loadable_module)',
|
| @@ -356,7 +338,6 @@
|
| 'examples/pepper_container_app/resource_creation_impl.h',
|
| 'examples/pepper_container_app/thunk.h',
|
| 'examples/pepper_container_app/type_converters.h',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -371,7 +352,6 @@
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| 'mojo_native_viewport_bindings',
|
| @@ -386,7 +366,6 @@
|
| 'examples/surfaces_app/surfaces_app.cc',
|
| 'examples/surfaces_app/surfaces_util.cc',
|
| 'examples/surfaces_app/surfaces_util.h',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -424,7 +403,6 @@
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| 'mojo_surfaces_app_bindings',
|
| @@ -438,7 +416,6 @@
|
| 'examples/surfaces_app/child_impl.h',
|
| 'examples/surfaces_app/surfaces_util.cc',
|
| 'examples/surfaces_app/surfaces_util.h',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| ],
|
| @@ -458,7 +435,6 @@
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_aura_support',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -467,7 +443,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/aura_demo/aura_demo.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -476,13 +451,11 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_view_manager_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/aura_demo/view_manager_init.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -504,7 +477,6 @@
|
| '../url/url.gyp:url_lib',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_aura_support',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -518,7 +490,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/browser/browser.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -539,7 +510,6 @@
|
| '../ui/gl/gl.gyp:gl',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_geometry_bindings',
|
| 'mojo_view_manager_bindings',
|
| @@ -548,7 +518,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/demo_launcher/demo_launcher.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -570,7 +539,6 @@
|
| '../url/url.gyp:url_lib',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_aura_support',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -589,7 +557,6 @@
|
| 'examples/keyboard/keyboard.cc',
|
| 'examples/keyboard/keys.cc',
|
| 'examples/keyboard/keys.h',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -637,7 +604,6 @@
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| 'mojo_base.gyp:mojo_utility',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_aura_support',
|
| 'mojo_core_window_manager_lib',
|
| 'mojo_geometry_bindings',
|
| @@ -656,7 +622,6 @@
|
| 'examples/window_manager/debug_panel.h',
|
| 'examples/window_manager/debug_panel.cc',
|
| 'examples/window_manager/window_manager.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -669,7 +634,6 @@
|
| '../url/url.gyp:url_lib',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_geometry_bindings',
|
| 'mojo_navigation_bindings',
|
| @@ -680,7 +644,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/embedded_app/embedded_app.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -693,7 +656,6 @@
|
| '../url/url.gyp:url_lib',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_geometry_bindings',
|
| 'mojo_navigation_bindings',
|
| @@ -704,7 +666,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/nesting_app/nesting_app.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -716,7 +677,6 @@
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| '../ui/views/views.gyp:views',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_input_events_lib',
|
| 'mojo_media_viewer_bindings',
|
| 'mojo_navigation_bindings',
|
| @@ -727,7 +687,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/media_viewer/media_viewer.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -736,14 +695,12 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_core_window_manager_lib',
|
| 'mojo_view_manager_lib',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/wm_flow/wm/wm.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -752,13 +709,11 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_view_manager_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/wm_flow/init/init.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -795,7 +750,6 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_core_window_manager_bindings',
|
| 'mojo_view_manager_lib',
|
| 'mojo_wm_flow_embeddee_bindings',
|
| @@ -804,7 +758,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/wm_flow/app/app.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -813,7 +766,6 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| 'mojo_base.gyp:mojo_application_chromium',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| 'mojo_core_window_manager_bindings',
|
| 'mojo_view_manager_lib',
|
| 'mojo_wm_flow_embeddee_bindings',
|
| @@ -822,7 +774,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/wm_flow/embedded/embedded.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| ],
|
| @@ -836,14 +787,12 @@
|
| '../base/base.gyp:base',
|
| 'mojo_base.gyp:mojo_application_standalone',
|
| 'mojo_base.gyp:mojo_cpp_bindings',
|
| - 'mojo_base.gyp:mojo_environment_standalone',
|
| 'mojo_base.gyp:mojo_utility',
|
| 'mojo_echo_bindings',
|
| '<(mojo_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/dbus_echo/dbus_echo_app.cc',
|
| - 'public/cpp/application/lib/mojo_main_standalone.cc',
|
| ],
|
| },
|
| ],
|
|
|