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

Unified Diff: mojo/mojo_examples.gypi

Issue 231353002: Make mojo_system static and mojo_system_impl a component, never use both (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the mac loader path dependencies Created 6 years, 8 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_public.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 15b4f6196fa962f107e544c530d8185ee1049877..590285fd192ef0dd3cbfcf2e218f5e4c699e9e91 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -44,7 +44,6 @@
'../skia/skia.gyp:skia',
'../gpu/gpu.gyp:gles2_implementation',
'mojo_gles2',
- 'mojo_system',
],
'sources': [
'examples/compositor_app/mojo_context_provider.cc',
@@ -65,7 +64,7 @@
'mojo_gles2',
'mojo_native_viewport_bindings',
'mojo_shell_client',
- 'mojo_system',
+ 'mojo_system_impl',
],
'sources': [
'examples/compositor_app/compositor_app.cc',
@@ -94,7 +93,7 @@
'mojo_gles2',
'mojo_native_viewport_bindings',
'mojo_shell_client',
- 'mojo_system',
+ 'mojo_system_impl',
],
'defines': [
# We don't really want to export. We could change how
@@ -215,7 +214,7 @@
'mojo_environment_chromium',
'mojo_gles2',
'mojo_shell_client',
- 'mojo_system',
+ 'mojo_system_impl'
],
'sources': [
'examples/aura_demo/aura_demo.cc',
@@ -240,11 +239,9 @@
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
'mojo_bindings',
- 'mojo_system',
],
'dependencies': [
'mojo_bindings',
- 'mojo_system',
],
},
{
@@ -266,7 +263,7 @@
'mojo_gles2',
'mojo_launcher_bindings',
'mojo_shell_client',
- 'mojo_system',
+ 'mojo_system_impl',
],
'sources': [
'examples/launcher/launcher.cc',
@@ -291,11 +288,9 @@
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
'mojo_bindings',
- 'mojo_system',
],
'dependencies': [
'mojo_bindings',
- 'mojo_system',
],
},
{
@@ -309,7 +304,7 @@
'mojo_launcher_bindings',
'mojo_native_viewport_bindings',
'mojo_shell_client',
- 'mojo_system',
+ 'mojo_system_impl',
'mojo_view_manager_bindings',
],
'sources': [
« no previous file with comments | « mojo/mojo_apps.gypi ('k') | mojo/mojo_public.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698