summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2014-10-31 17:49:34 -0700
committerCommit bot <commit-bot@chromium.org>2014-11-01 00:49:47 +0000
commit6cdbabebc60c42a496af70fa7a6792454d05ecb9 (patch)
tree081e25700ee035ceabb3f37a1917ee4a1c268cb8 /mojo/mojo.gyp
parente578b111e76e6b9b1240dfca6ccc92ee352e3596 (diff)
downloadchromium_src-6cdbabebc60c42a496af70fa7a6792454d05ecb9.zip
chromium_src-6cdbabebc60c42a496af70fa7a6792454d05ecb9.tar.gz
chromium_src-6cdbabebc60c42a496af70fa7a6792454d05ecb9.tar.bz2
Split out mojo_converters into its own target.
The mojo_surface_converters get their own file to avoid dependency cycles between media/ and cc/ BUG=none TEST=no more cycles when media depends on type conveters. Review URL: https://codereview.chromium.org/691573003 Cr-Commit-Position: refs/heads/master@{#302367}
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp9
1 files changed, 4 insertions, 5 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 8102d1a..9f4f1af 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -4,7 +4,6 @@
{
'includes': [
- 'mojo_converters.gypi',
'mojo_variables.gypi',
],
'targets': [
@@ -17,11 +16,11 @@
'mojo_application_manager',
'mojo_application_manager_unittests',
'mojo_base.gyp:mojo_base',
- 'mojo_geometry_lib',
- 'mojo_input_events_lib',
+ 'mojo_geometry_converters.gyp:mojo_geometry_lib',
+ 'mojo_input_events_converters.gyp:mojo_input_events_lib',
'mojo_js_unittests',
- 'mojo_surfaces_lib',
- 'mojo_surfaces_lib_unittests',
+ 'mojo_surface_converters.gyp:mojo_surfaces_lib',
+ 'mojo_surface_converters.gyp:mojo_surfaces_lib_unittests',
'services/public/mojo_services_public.gyp:mojo_services_public',
'public/mojo_public.gyp:mojo_public',
],