Index: mojo/mojo_services.gypi |
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi |
index 92f50bf85430f69278623611dc41c48ccf2ed31b..db58fe421da8015e70b8755ff2955ed8988d846d 100644 |
--- a/mojo/mojo_services.gypi |
+++ b/mojo/mojo_services.gypi |
@@ -30,7 +30,6 @@ |
'../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_navigation_bindings', |
@@ -43,7 +42,6 @@ |
'third_party/WebKit' |
], |
'sources': [ |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
'services/html_viewer/blink_input_events_type_converters.cc', |
'services/html_viewer/blink_input_events_type_converters.h', |
'services/html_viewer/blink_platform_impl.cc', |
@@ -266,7 +264,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_gles2_service', |
@@ -376,7 +373,6 @@ |
'../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_network_bindings', |
], |
@@ -418,7 +414,6 @@ |
'../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_application_chromium', |
'mojo_cc_support', |
'mojo_geometry_bindings', |
@@ -434,7 +429,6 @@ |
'services/surfaces/surfaces_impl.h', |
'services/surfaces/surfaces_service_application.cc', |
'services/surfaces/surfaces_service_application.h', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -468,7 +462,6 @@ |
'../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_launcher_bindings', |
'mojo_network_bindings', |
@@ -476,7 +469,6 @@ |
], |
'sources': [ |
'services/launcher/launcher.cc', |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
], |
}, |
{ |
@@ -609,14 +601,12 @@ |
'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_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', |
@@ -633,14 +623,12 @@ |
'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_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', |
@@ -688,7 +676,6 @@ |
'../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_cc_support', |
'mojo_geometry_bindings', |
@@ -703,7 +690,6 @@ |
'<(mojo_system_for_component)', |
], |
'sources': [ |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
'services/view_manager/access_policy.h', |
'services/view_manager/access_policy_delegate.h', |
'services/view_manager/default_access_policy.cc', |
@@ -778,7 +764,6 @@ |
'../ui/gl/gl.gyp:gl', |
'mojo_application_manager', |
'mojo_base.gyp:mojo_system_impl', |
- 'mojo_base.gyp:mojo_environment_chromium', |
'mojo_base.gyp:mojo_application_chromium', |
'mojo_geometry_bindings', |
'mojo_geometry_lib', |
@@ -812,7 +797,6 @@ |
'../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_aura_support', |
'mojo_core_window_manager_bindings', |
@@ -834,7 +818,6 @@ |
'<(mojo_system_for_loadable_module)', |
], |
'sources': [ |
- 'public/cpp/application/lib/mojo_main_chromium.cc', |
'services/window_manager/main.cc', |
], |
}, |
@@ -883,7 +866,6 @@ |
'../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_dbus_service', |