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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_examples.gypi

Issue 346613004: Use loadable module instead of shared library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Follow review Created 6 years, 6 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_apps.gypi ('k') | mojo/mojo_services.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 6787a18db29162b2acf59096ecf3bcd49e43d674..915f6e0fe3592652b7a5e05c7b4b2593c9d1facb 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -6,12 +6,13 @@
'targets': [
{
'target_name': 'mojo_sample_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
# TODO(darin): we should not be linking against these libraries!
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_application',
+ 'mojo_common_embedded_lib',
'mojo_cpp_bindings',
'mojo_environment_standalone',
'mojo_geometry_bindings',
@@ -38,7 +39,7 @@
},
{
'target_name': 'mojo_compositor_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -46,13 +47,13 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_application',
'mojo_cc_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
],
'sources': [
'examples/compositor_app/compositor_app.cc',
@@ -70,9 +71,10 @@
},
{
'target_name': 'mojo_wget',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'mojo_application',
+ 'mojo_common_embedded_lib',
'mojo_cpp_bindings',
'mojo_environment_standalone',
'mojo_network_bindings',
@@ -93,7 +95,7 @@
},
{
'target_name': 'mojo_html_viewer',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -101,12 +103,13 @@
'../ui/native_theme/native_theme.gyp:native_theme',
'../url/url.gyp:url_lib',
'mojo_application',
+ 'mojo_common_embedded_lib',
'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_environment_chromium_embedded',
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_utility',
'mojo_view_manager_lib',
],
@@ -150,18 +153,19 @@
},
{
'target_name': 'mojo_png_viewer',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'mojo_application',
+ 'mojo_common_embedded_lib',
'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_environment_chromium_embedded',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_utility',
'mojo_view_manager_lib',
],
@@ -172,7 +176,7 @@
},
{
'target_name': 'mojo_pepper_container_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -181,12 +185,12 @@
'../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
'../ui/events/events.gyp:events_base',
'mojo_application',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
],
'defines': [
# We don't really want to export. We could change how
@@ -272,7 +276,7 @@
'targets': [
{
'target_name': 'mojo_aura_demo',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -283,11 +287,11 @@
'../ui/gfx/gfx.gyp:gfx_geometry',
'mojo_application',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_geometry_lib',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_view_manager_lib',
],
'sources': [
@@ -297,12 +301,13 @@
},
{
'target_name': 'mojo_aura_demo_init',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'mojo_application',
- 'mojo_environment_chromium',
- 'mojo_system_impl',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
+ 'mojo_system',
'mojo_view_manager_bindings',
],
'sources': [
@@ -312,7 +317,7 @@
},
{
'target_name': 'mojo_browser',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -329,13 +334,13 @@
'../url/url.gyp:url_lib',
'mojo_application',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_lib',
'mojo_navigation_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_views_support',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
@@ -355,7 +360,7 @@
},
{
'target_name': 'mojo_demo_launcher',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -364,11 +369,12 @@
'../ui/gl/gl.gyp:gl',
'mojo_application',
'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_view_manager_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_utility',
],
'sources': [
@@ -378,7 +384,7 @@
},
{
'target_name': 'mojo_keyboard',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -395,14 +401,14 @@
'../url/url.gyp:url_lib',
'mojo_application',
'mojo_aura_support',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_input_events_lib',
'mojo_keyboard_bindings',
'mojo_navigation_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_views_support',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
@@ -448,7 +454,7 @@
},
{
'target_name': 'mojo_window_manager',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../ui/aura/aura.gyp:aura',
@@ -462,7 +468,8 @@
'mojo_application',
'mojo_aura_support',
'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_geometry_lib',
'mojo_gles2',
@@ -473,7 +480,7 @@
'mojo_view_manager_lib',
'mojo_views_support',
'mojo_window_manager_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_utility',
],
'sources': [
@@ -485,7 +492,7 @@
},
{
'target_name': 'mojo_embedded_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../ui/gfx/gfx.gyp:gfx_geometry',
@@ -493,13 +500,14 @@
'../url/url.gyp:url_lib',
'mojo_application',
'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_utility',
],
'sources': [
@@ -509,21 +517,22 @@
},
{
'target_name': 'mojo_nesting_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
'mojo_application',
+ 'mojo_common_embedded_lib',
'mojo_cpp_bindings',
- 'mojo_environment_chromium',
+ 'mojo_environment_chromium_embedded',
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_utility',
],
'sources': [
@@ -533,18 +542,19 @@
},
{
'target_name': 'mojo_media_viewer',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/views/views.gyp:views',
'mojo_application',
- 'mojo_environment_chromium',
+ 'mojo_common_embedded_lib',
+ 'mojo_environment_chromium_embedded',
'mojo_input_events_lib',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
- 'mojo_system_impl',
+ 'mojo_system',
'mojo_views_support',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
@@ -560,10 +570,11 @@
'targets': [
{
'target_name': 'mojo_dbus_echo',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'mojo_application',
+ 'mojo_common_embedded_lib',
'mojo_cpp_bindings',
'mojo_environment_standalone',
'mojo_echo_bindings',
« no previous file with comments | « mojo/mojo_apps.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698