| Index: mojo/mojo_examples.gypi
|
| diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
|
| index 00bfc7e01f2ea46f68e76c518a902bae4b45dae0..9ba99c59c3ee45756ea569690fda0b8e3727bab2 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_gles2',
|
| @@ -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',
|
| ],
|
| },
|
| {
|
| @@ -106,7 +100,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',
|
| @@ -118,7 +111,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',
|
| ],
|
| },
|
| {
|
| @@ -134,14 +126,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',
|
| ],
|
| },
|
| {
|
| @@ -173,7 +163,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',
|
| @@ -184,7 +173,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/png_viewer/png_viewer.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -199,7 +187,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_gles2',
|
| 'mojo_native_viewport_bindings',
|
| @@ -280,7 +267,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',
|
| ],
|
| },
|
| {
|
| @@ -295,7 +281,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_base.gyp:mojo_system_impl',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -312,7 +297,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',
|
| ],
|
| },
|
| {
|
| @@ -350,7 +334,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_base.gyp:mojo_system_impl',
|
| 'mojo_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -365,7 +348,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',
|
| ],
|
| },
|
| ],
|
| @@ -385,7 +367,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',
|
| @@ -394,7 +375,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/aura_demo/aura_demo.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -403,13 +383,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',
|
| ],
|
| },
|
| {
|
| @@ -431,7 +409,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',
|
| @@ -445,7 +422,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/browser/browser.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -466,7 +442,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_gles2',
|
| @@ -475,7 +450,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/demo_launcher/demo_launcher.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -497,7 +471,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',
|
| @@ -516,7 +489,6 @@
|
| 'examples/keyboard/keyboard.cc',
|
| 'examples/keyboard/keys.cc',
|
| 'examples/keyboard/keys.h',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -564,7 +536,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_geometry_bindings',
|
| 'mojo_geometry_lib',
|
| @@ -582,7 +553,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',
|
| ],
|
| },
|
| {
|
| @@ -595,7 +565,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_gles2',
|
| @@ -606,7 +575,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/embedded_app/embedded_app.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -619,7 +587,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_gles2',
|
| @@ -630,7 +597,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/nesting_app/nesting_app.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -642,7 +608,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',
|
| @@ -653,7 +618,6 @@
|
| ],
|
| 'sources': [
|
| 'examples/media_viewer/media_viewer.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| {
|
| @@ -662,14 +626,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',
|
| ],
|
| },
|
| {
|
| @@ -678,13 +640,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',
|
| ],
|
| },
|
| {
|
| @@ -693,14 +653,12 @@
|
| '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_system_for_loadable_module)',
|
| ],
|
| 'sources': [
|
| 'examples/wm_flow/app/app.cc',
|
| - 'public/cpp/application/lib/mojo_main_chromium.cc',
|
| ],
|
| },
|
| ],
|
| @@ -714,14 +672,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',
|
| ],
|
| },
|
| ],
|
|
|