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

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: Updated 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_base.gyp ('K') | « mojo/mojo_base.gyp ('k') | mojo/mojo_public.gypi » ('j') | mojo/mojo_public.gypi » ('J')
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 f51de2dfc52717fe8a8e11b7022cc0b28e03d310..04796310e4b3a6d2c39632f9e3654d1ce9752c00 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -11,13 +11,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_cpp_bindings',
viettrungluu 2014/07/28 22:51:32 alphabetical order (elsewhere in this file too)
Hajime Morrita 2014/07/28 23:04:08 Done.
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -44,10 +44,10 @@
'../cc/cc.gyp:cc',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- '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',
@@ -72,11 +72,11 @@
'target_name': 'mojo_wget',
'type': 'loadable_module',
'dependencies': [
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_network_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -99,10 +99,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',
],
},
{
@@ -111,14 +111,14 @@
'dependencies': [
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_utility',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
],
@@ -137,9 +137,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_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
@@ -233,9 +233,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_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -243,7 +244,6 @@
'mojo_surfaces_bindings',
'mojo_surfaces_app_bindings',
'mojo_surfaces_lib',
- 'mojo_system_impl',
],
'sources': [
'examples/surfaces_app/embedder.cc',
@@ -262,10 +262,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',
],
@@ -287,15 +287,15 @@
'../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_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_system_impl',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_surfaces_app_bindings',
'mojo_surfaces_bindings',
'mojo_surfaces_lib',
- 'mojo_system_impl',
],
'sources': [
'examples/surfaces_app/child_app.cc',
@@ -321,10 +321,10 @@
'../ui/compositor/compositor.gyp:compositor',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
- '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_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_view_manager_lib',
@@ -340,8 +340,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_view_manager_bindings',
'<(mojo_system_for_loadable_module)',
],
@@ -367,10 +367,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_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_lib',
@@ -402,13 +402,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_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_view_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -433,10 +433,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_common_lib',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_lib',
@@ -465,10 +465,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',
],
},
{
@@ -478,12 +478,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',
],
},
{
@@ -499,10 +499,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_cpp_bindings',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_aura_support',
- 'mojo_cpp_bindings',
- 'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -513,7 +514,6 @@
'mojo_view_manager_lib',
'mojo_views_support',
'mojo_window_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -531,15 +531,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_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -555,15 +555,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_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
@@ -579,8 +579,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_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_input_events_lib',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
@@ -599,8 +599,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_core_window_manager_lib',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
@@ -615,8 +615,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_view_manager_bindings',
'<(mojo_system_for_loadable_module)',
],
@@ -630,8 +630,8 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_environment_chromium',
+ 'mojo_base.gyp:mojo_application',
'mojo_core_window_manager_bindings',
'mojo_view_manager_lib',
'<(mojo_system_for_loadable_module)',
@@ -650,11 +650,11 @@
'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
- 'mojo_application',
- 'mojo_cpp_bindings',
- 'mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_cpp_bindings',
+ 'mojo_base.gyp:mojo_environment_standalone',
+ 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application',
'mojo_echo_bindings',
- 'mojo_utility',
'<(mojo_system_for_loadable_module)',
],
'sources': [
« mojo/mojo_base.gyp ('K') | « mojo/mojo_base.gyp ('k') | mojo/mojo_public.gypi » ('j') | mojo/mojo_public.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698