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

Unified Diff: mojo/mojo.gyp

Issue 256133002: Changes view manager test to connect via shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to trunk 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 | « no previous file | mojo/mojo_services.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index ddf77f7ccdd4d3d704d64b3ad9c12be490436152..de2c7d30edbbeca7a669d4c7a6f5cf33f6cd78a5 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -438,6 +438,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_static',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
'mojo_external_service_bindings',
@@ -501,6 +502,30 @@
'../dbus/dbus.gyp:dbus',
],
}],
+ ['use_aura==1', {
+ 'dependencies': [
+ # These are only necessary as long as we hard code use of ViewManager.
+ '../skia/skia.gyp:skia',
+ 'mojo_shell_client',
+ 'mojo_view_manager',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'mojo_shell_test_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_static',
+ '../url/url.gyp:url_lib',
+ 'mojo_service_manager',
+ 'mojo_shell_lib',
+ 'mojo_system_impl',
+ ],
+ 'sources': [
+ 'shell/shell_test_helper.cc',
+ 'shell/shell_test_helper.h',
],
},
{
« no previous file with comments | « no previous file | mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698