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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/mojo_examples.gypi

Issue 370983002: Mojo: Enable apps built against the chromium env to be built as shared libraries (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: improvements 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_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..c23b4aa488a34e6951145fe39aad5e7078ca3e1d 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -6,7 +6,7 @@
'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',
@@ -17,8 +17,8 @@
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_system',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/sample_app/gles2_client_impl.cc',
@@ -38,7 +38,7 @@
},
{
'target_name': 'mojo_compositor_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -52,7 +52,7 @@
'mojo_geometry_lib',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_system_impl',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/compositor_app/compositor_app.cc',
@@ -70,14 +70,14 @@
},
{
'target_name': 'mojo_wget',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'mojo_application',
'mojo_cpp_bindings',
'mojo_environment_standalone',
'mojo_network_bindings',
- 'mojo_system',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/wget/wget.cc',
@@ -93,7 +93,7 @@
},
{
'target_name': 'mojo_html_viewer',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -101,14 +101,15 @@
'../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_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_system_impl',
'mojo_utility',
'mojo_view_manager_lib',
+ '<(mojo_system_for_loadable_module)',
],
'include_dirs': [
'third_party/WebKit'
@@ -150,7 +151,7 @@
},
{
'target_name': 'mojo_png_viewer',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
@@ -161,9 +162,9 @@
'mojo_navigation_bindings',
'mojo_network_bindings',
'mojo_launcher_bindings',
- 'mojo_system_impl',
'mojo_utility',
'mojo_view_manager_lib',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/png_viewer/png_viewer.cc',
@@ -172,7 +173,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',
@@ -186,7 +187,7 @@
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_native_viewport_bindings',
- 'mojo_system_impl',
+ '<(mojo_system_for_loadable_module)',
],
'defines': [
# We don't really want to export. We could change how
@@ -272,7 +273,7 @@
'targets': [
{
'target_name': 'mojo_aura_demo',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -287,8 +288,8 @@
'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
- 'mojo_system_impl',
'mojo_view_manager_lib',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/aura_demo/aura_demo.cc',
@@ -297,13 +298,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_view_manager_bindings',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/aura_demo/view_manager_init.cc',
@@ -312,7 +313,7 @@
},
{
'target_name': 'mojo_browser',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -335,11 +336,11 @@
'mojo_geometry_lib',
'mojo_input_events_lib',
'mojo_navigation_bindings',
- 'mojo_system_impl',
'mojo_views_support',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/browser/browser.cc',
@@ -355,7 +356,7 @@
},
{
'target_name': 'mojo_demo_launcher',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -368,8 +369,8 @@
'mojo_geometry_bindings',
'mojo_gles2',
'mojo_view_manager_bindings',
- 'mojo_system_impl',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/demo_launcher/demo_launcher.cc',
@@ -378,7 +379,7 @@
},
{
'target_name': 'mojo_keyboard',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../cc/cc.gyp:cc',
@@ -402,10 +403,10 @@
'mojo_input_events_lib',
'mojo_keyboard_bindings',
'mojo_navigation_bindings',
- 'mojo_system_impl',
'mojo_views_support',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/keyboard/keyboard_delegate.h',
@@ -448,7 +449,7 @@
},
{
'target_name': 'mojo_window_manager',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../ui/aura/aura.gyp:aura',
@@ -473,8 +474,8 @@
'mojo_view_manager_lib',
'mojo_views_support',
'mojo_window_manager_bindings',
- 'mojo_system_impl',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/window_manager/debug_panel.h',
@@ -485,7 +486,7 @@
},
{
'target_name': 'mojo_embedded_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../ui/gfx/gfx.gyp:gfx_geometry',
@@ -499,8 +500,8 @@
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_system_impl',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/embedded_app/embedded_app.cc',
@@ -509,7 +510,7 @@
},
{
'target_name': 'mojo_nesting_app',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../ui/gfx/gfx.gyp:gfx_geometry',
@@ -523,8 +524,8 @@
'mojo_navigation_bindings',
'mojo_view_manager_lib',
'mojo_window_manager_bindings',
- 'mojo_system_impl',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/nesting_app/nesting_app.cc',
@@ -533,7 +534,7 @@
},
{
'target_name': 'mojo_media_viewer',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -544,10 +545,10 @@
'mojo_input_events_lib',
'mojo_media_viewer_bindings',
'mojo_navigation_bindings',
- 'mojo_system_impl',
'mojo_views_support',
'mojo_view_manager_bindings',
'mojo_view_manager_lib',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/media_viewer/media_viewer.cc',
@@ -560,15 +561,15 @@
'targets': [
{
'target_name': 'mojo_dbus_echo',
- 'type': 'shared_library',
+ 'type': 'loadable_module',
'dependencies': [
'../base/base.gyp:base',
'mojo_application',
'mojo_cpp_bindings',
'mojo_environment_standalone',
'mojo_echo_bindings',
- 'mojo_system',
'mojo_utility',
+ '<(mojo_system_for_loadable_module)',
],
'sources': [
'examples/dbus_echo/dbus_echo_app.cc',
« 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