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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_examples.gypi

Issue 422163004: Extract mojo_base.gyp from mojo.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Landing 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
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/mojo_public_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_examples.gypi
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index 1a79c66a96b0ec80b7b6245dbe05706186903b70..430d9b40c7acd54b9dc2eacdc78e1ca724c2b76d 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -8,11 +8,11 @@
'target_name': 'mojo_echo_client',
'type': 'loadable_module',
'dependencies': [
- 'mojo_application',
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
'mojo_echo_service_bindings',
- 'mojo_environment_standalone',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -34,22 +34,22 @@
'examples/echo/echo_service.mojom',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
'target_name': 'mojo_echo_service',
'type': 'loadable_module',
'dependencies': [
- 'mojo_application',
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
'mojo_echo_service_bindings',
- 'mojo_environment_standalone',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -71,13 +71,13 @@
# TODO(darin): we should not be linking against these libraries!
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -104,10 +104,10 @@
'../cc/cc.gyp:cc',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_cc_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -132,11 +132,11 @@
'target_name': 'mojo_wget',
'type': 'loadable_module',
'dependencies': [
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
'mojo_network_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -159,10 +159,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',
],
},
{
@@ -171,14 +171,14 @@
'dependencies': [
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_utility',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
],
@@ -197,9 +197,9 @@
'../ppapi/ppapi.gyp:ppapi_c',
'../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
'../ui/events/events.gyp:events_base',
- 'mojo_application',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
@@ -293,9 +293,10 @@
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -322,10 +323,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_surfaces_bindings',
],
@@ -347,9 +348,10 @@
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_surfaces_app_bindings',
@@ -381,10 +383,10 @@
'../ui/compositor/compositor.gyp:compositor',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_view_manager_lib',
@@ -400,8 +402,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_view_manager_bindings',
'<(mojo_system_for_loadable_module)',
],
@@ -427,10 +429,10 @@
'../ui/resources/ui_resources.gyp:ui_test_pak',
'../ui/views/views.gyp:views',
'../url/url.gyp:url_lib',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_lib',
@@ -462,13 +464,13 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_view_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -493,10 +495,10 @@
'../ui/resources/ui_resources.gyp:ui_test_pak',
'../ui/views/views.gyp:views',
'../url/url.gyp:url_lib',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_lib',
@@ -525,10 +527,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',
],
},
{
@@ -538,12 +540,12 @@
'examples/window_manager/window_manager.mojom',
],
'dependencies': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_cpp_bindings',
],
},
{
@@ -559,10 +561,11 @@
'../ui/resources/ui_resources.gyp:ui_resources',
'../ui/resources/ui_resources.gyp:ui_test_pak',
'../ui/views/views.gyp:views',
- 'mojo_application',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_aura_support',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -573,7 +576,6 @@
'mojo_view_manager_lib',
'mojo_views_support',
'mojo_window_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -591,15 +593,15 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -615,15 +617,15 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -639,8 +641,8 @@
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/views/views.gyp:views',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_input_events_lib',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
@@ -659,8 +661,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_core_window_manager_lib',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
@@ -675,8 +677,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_view_manager_bindings',
'<(mojo_system_for_loadable_module)',
],
@@ -690,8 +692,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_environment_chromium',
'mojo_core_window_manager_bindings',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
@@ -710,11 +712,11 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_application',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
'mojo_echo_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/mojo_public_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698