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

Unified Diff: mojo/mojo_examples.gypi

Issue 313483002: Gets aura_demo working with the view_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 master and fix windows Created 6 years, 7 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.gyp ('k') | no next file » | 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 d99bf5a05079bd74aede237ce5b12fbc690b97a9..82b7101102f8a93f0947f08115d2ddc1f20fce28 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -170,22 +170,43 @@
'type': 'shared_library',
'dependencies': [
'../base/base.gyp:base',
+ '../cc/cc.gyp:cc',
'../ui/aura/aura.gyp:aura',
'../ui/base/ui_base.gyp:ui_base',
+ '../ui/compositor/compositor.gyp:compositor',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
+ 'mojo_application',
'mojo_aura_support',
- 'mojo_cc_support',
'mojo_common_lib',
'mojo_environment_chromium',
'mojo_geometry_bindings',
'mojo_geometry_lib',
- 'mojo_gles2',
- 'mojo_main_chromium',
- 'mojo_system_impl'
+ 'mojo_system_impl',
+ 'mojo_view_manager_bindings',
],
'sources': [
+ 'examples/aura_demo/context_factory_view_manager.cc',
+ 'examples/aura_demo/context_factory_view_manager.h',
+ 'examples/aura_demo/window_tree_host_view_manager.cc',
+ 'examples/aura_demo/window_tree_host_view_manager.h',
'examples/aura_demo/aura_demo.cc',
+ 'public/cpp/application/lib/mojo_main_chromium.cc',
+ ],
+ },
+ {
+ 'target_name': 'mojo_aura_demo_init',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'mojo_application',
+ 'mojo_environment_chromium',
+ 'mojo_system_impl',
+ 'mojo_view_manager_bindings',
+ ],
+ 'sources': [
+ 'examples/aura_demo/view_manager_init.cc',
+ 'public/cpp/application/lib/mojo_main_chromium.cc',
],
},
{
« no previous file with comments | « mojo/mojo.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698