Index: mojo/mojo_examples.gypi |
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi |
index 834fe4d8c792c1f4fe003c5782a0a1ffbaf80ee3..f6c5a19dc2a5fdf4e2c4de5af75107cd27db0f7d 100644 |
--- a/mojo/mojo_examples.gypi |
+++ b/mojo/mojo_examples.gypi |
@@ -11,14 +11,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', |
], |
}, |
{ |
@@ -50,14 +48,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', |
], |
}, |
{ |
@@ -74,7 +70,6 @@ |
'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_geometry_bindings', |
'mojo_gpu_bindings', |
@@ -88,7 +83,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', |
], |
}, |
{ |
@@ -118,7 +112,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)', |
@@ -128,7 +121,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', |
], |
}, |
{ |
@@ -137,7 +129,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. |
@@ -168,7 +159,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', |
@@ -181,7 +171,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', |
], |
}, |
{ |
@@ -198,14 +187,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', |
], |
}, |
{ |
@@ -214,14 +201,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', |
], |
}, |
{ |
@@ -253,7 +238,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', |
@@ -264,7 +248,6 @@ |
], |
'sources': [ |
'examples/png_viewer/png_viewer.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -279,7 +262,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_gpu_bindings', |
'mojo_native_viewport_bindings', |
@@ -361,7 +343,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', |
], |
}, |
{ |
@@ -376,7 +357,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_gpu_bindings', |
@@ -392,7 +372,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', |
], |
}, |
{ |
@@ -430,7 +409,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', |
@@ -444,7 +422,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', |
], |
}, |
{ |
@@ -459,7 +436,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_gpu_bindings', |
@@ -477,7 +453,6 @@ |
'examples/surfaces_app/surfaces_util.h', |
'examples/sample_app/spinning_cube.cc', |
'examples/sample_app/spinning_cube.h', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
} |
], |
@@ -497,7 +472,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', |
@@ -506,7 +480,6 @@ |
], |
'sources': [ |
'examples/aura_demo/aura_demo.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -515,13 +488,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', |
], |
}, |
{ |
@@ -543,7 +514,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', |
@@ -557,7 +527,6 @@ |
], |
'sources': [ |
'examples/browser/browser.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -578,7 +547,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', |
@@ -587,7 +555,6 @@ |
], |
'sources': [ |
'examples/demo_launcher/demo_launcher.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -609,7 +576,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', |
@@ -628,7 +594,6 @@ |
'examples/keyboard/keyboard.cc', |
'examples/keyboard/keys.cc', |
'examples/keyboard/keys.h', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -676,7 +641,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', |
@@ -695,7 +659,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', |
], |
}, |
{ |
@@ -708,7 +671,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', |
@@ -719,7 +681,6 @@ |
], |
'sources': [ |
'examples/embedded_app/embedded_app.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -732,7 +693,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', |
@@ -743,7 +703,6 @@ |
], |
'sources': [ |
'examples/nesting_app/nesting_app.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -755,7 +714,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', |
@@ -766,7 +724,6 @@ |
], |
'sources': [ |
'examples/media_viewer/media_viewer.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -775,14 +732,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', |
], |
}, |
{ |
@@ -791,13 +746,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', |
], |
}, |
{ |
@@ -834,7 +787,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', |
@@ -843,7 +795,6 @@ |
], |
'sources': [ |
'examples/wm_flow/app/app.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -852,7 +803,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', |
@@ -861,7 +811,6 @@ |
], |
'sources': [ |
'examples/wm_flow/embedded/embedded.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
], |
@@ -875,14 +824,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', |
], |
}, |
], |