Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1406)

Unified Diff: mojo/mojo_services.gypi

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rev Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 3e07f8e034055354392eb999e495e62c1bbbc477..1bbb3c0ff315928e1f49ca0344f52b0249a252b7 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',
@@ -302,7 +300,6 @@
'../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_geometry_bindings',
'mojo_geometry_lib',
@@ -391,7 +388,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',
],
@@ -432,7 +428,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_system_impl',
'mojo_base.gyp:mojo_application_chromium',
'mojo_cc_support',
@@ -448,7 +443,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',
],
},
{
@@ -482,7 +476,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',
@@ -490,7 +483,6 @@
],
'sources': [
'services/launcher/launcher.cc',
- 'public/cpp/application/lib/mojo_main_chromium.cc',
],
},
{
@@ -627,14 +619,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',
@@ -651,14 +641,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',
@@ -706,7 +694,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',
@@ -720,7 +707,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',
@@ -796,7 +782,6 @@
'../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_geometry_bindings',
'mojo_geometry_lib',
@@ -831,7 +816,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',
@@ -852,7 +836,6 @@
'<(mojo_system_for_loadable_module)',
],
'sources': [
- 'public/cpp/application/lib/mojo_main_chromium.cc',
'services/window_manager/main.cc',
],
},
@@ -901,7 +884,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',

Powered by Google App Engine
This is Rietveld 408576698