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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_services.gypi

Issue 422163004: Extract mojo_base.gyp from mojo.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« mojo/mojo_public_tests.gypi ('K') | « mojo/mojo_public_tests.gypi ('k') | mojo/mojo_variables.gypi » ('j') | mojo/mojo_variables.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index b66c1e42dc8428452574e58369afc9e5854c48fc..a8bad8b3413865a5e87e8bf0f8d11fcd3d0d9182 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -13,10 +13,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -28,14 +28,14 @@
'../third_party/WebKit/public/blink.gyp:blink',
'../ui/native_theme/native_theme.gyp:native_theme',
'../url/url.gyp:url_lib',
- 'mojo_application',
- 'mojo_common_lib',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ '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',
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_utility',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
],
@@ -75,7 +75,7 @@
'../base/base.gyp:base',
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_input_events_bindings',
'mojo_geometry_bindings',
'mojo_geometry_lib',
@@ -96,10 +96,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
],
},
@@ -112,10 +112,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -128,7 +128,7 @@
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_geometry_bindings',
'<(mojo_system_for_component)',
],
@@ -154,7 +154,7 @@
'../gpu/gpu.gyp:gpu',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_geometry_lib',
'mojo_surfaces_bindings',
'<(mojo_system_for_component)',
@@ -182,9 +182,9 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gfx/gfx.gyp:gfx_test_support',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_run_all_unittests',
'mojo_geometry_lib',
- 'mojo_run_all_unittests',
'mojo_surfaces_bindings',
'mojo_surfaces_lib',
],
@@ -243,11 +243,11 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
+ 'mojo_base.gyp:mojo_cpp_bindings',
'../gpu/gpu.gyp:command_buffer_common',
- 'mojo_cpp_bindings',
],
},
{
@@ -278,13 +278,13 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
'mojo_gles2_bindings',
'mojo_input_events_bindings',
- 'mojo_cpp_bindings',
],
},
{
@@ -296,9 +296,9 @@
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2_service',
@@ -328,7 +328,7 @@
}],
['OS=="android"', {
'dependencies': [
- 'mojo_jni_headers',
+ 'mojo_base.gyp:mojo_jni_headers',
],
}],
['OS=="win"', {
@@ -352,10 +352,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_network_bindings',
],
},
@@ -371,10 +371,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -384,9 +384,9 @@
'../base/base.gyp:base',
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
- 'mojo_application',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_network_bindings',
],
'export_dependent_settings': [
@@ -426,15 +426,15 @@
'../cc/cc.gyp:cc',
'../cc/cc.gyp:cc_surfaces',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_application',
'mojo_cc_support',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
'mojo_surfaces_bindings',
'mojo_surfaces_lib',
- 'mojo_system_impl',
],
'sources': [
'services/surfaces/surfaces_impl.cc',
@@ -460,10 +460,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_navigation_bindings',
],
},
@@ -473,9 +473,9 @@
'dependencies': [
'../base/base.gyp:base',
'../url/url.gyp:url_lib',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_launcher_bindings',
'mojo_network_bindings',
'<(mojo_system_for_loadable_module)',
@@ -495,10 +495,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
'mojo_input_events_bindings',
],
@@ -512,10 +512,10 @@
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_service_provider_bindings',
'mojo_geometry_bindings',
'mojo_geometry_lib',
- 'mojo_service_provider_bindings',
'mojo_view_manager_bindings',
'mojo_view_manager_common',
],
@@ -552,7 +552,7 @@
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_test_support',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_shell_test_support',
@@ -571,7 +571,7 @@
],
}, { # use_aura==0
'dependencies': [
- 'mojo_run_all_unittests',
+ 'mojo_base.gyp:mojo_run_all_unittests',
],
}],
],
@@ -587,10 +587,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
'mojo_native_viewport_bindings',
],
@@ -606,10 +606,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -617,10 +617,10 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_test_service_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -640,10 +640,10 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_test_service_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -667,10 +667,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
],
@@ -693,10 +693,10 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_cc_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -783,15 +783,15 @@
'../ui/aura/aura.gyp:aura',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_bindings',
'mojo_input_events_lib',
'mojo_service_manager',
'mojo_shell_test_support',
- 'mojo_system_impl',
'mojo_view_manager_bindings',
'mojo_view_manager_common',
'mojo_view_manager_run_unittests',
@@ -818,11 +818,11 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/wm/wm.gyp:wm',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_aura_support',
- 'mojo_common_lib',
'mojo_core_window_manager_bindings',
- 'mojo_environment_chromium',
'mojo_view_manager_lib',
],
'sources': [
@@ -851,11 +851,11 @@
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
'../ui/gl/gl.gyp:gl',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_core_window_manager_bindings',
- 'mojo_environment_chromium',
'mojo_service_manager',
'mojo_shell_test_support',
- 'mojo_system_impl',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
],
@@ -888,12 +888,12 @@
'../base/base.gyp:base',
'../build/linux/system.gyp:dbus',
'../dbus/dbus.gyp:dbus',
- 'mojo_application',
- 'mojo_common_lib',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_application',
'mojo_dbus_service',
'mojo_echo_bindings',
- 'mojo_environment_chromium',
- 'mojo_system_impl',
],
'sources': [
'services/dbus_echo/dbus_echo_service.cc',
« mojo/mojo_public_tests.gypi ('K') | « mojo/mojo_public_tests.gypi ('k') | mojo/mojo_variables.gypi » ('j') | mojo/mojo_variables.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698