diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 22:26:31 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 22:26:31 +0000 |
| commit | 4b1172e08cea51dc4c74d5fffe83cd4490acf7d0 (patch) | |
| tree | 62b99abb31a8e10519ce56e7fd131a059a9c65e5 /mojo | |
| parent | 1ef9001ca9c05ce22d2140c46856bbe52e61a6c5 (diff) | |
| download | chromium_src-4b1172e08cea51dc4c74d5fffe83cd4490acf7d0.zip chromium_src-4b1172e08cea51dc4c74d5fffe83cd4490acf7d0.tar.gz chromium_src-4b1172e08cea51dc4c74d5fffe83cd4490acf7d0.tar.bz2 | |
mojo: gyp fixes
- make mojo_sample_app correctly depend on the standalone environment since it uses it
- make mojo depend on mojo_compositor_app so we build that one too
BUG=
R=darin@chromium.org
Review URL: https://codereview.chromium.org/138323003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo.gyp | 1 | ||||
| -rw-r--r-- | mojo/mojo_examples.gypi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp index 432249b..2f7d73a 100644 --- a/mojo/mojo.gyp +++ b/mojo/mojo.gyp @@ -29,6 +29,7 @@ 'type': 'none', 'dependencies': [ 'mojo_bindings', + 'mojo_compositor_app', 'mojo_common_lib', 'mojo_common_unittests', 'mojo_js', diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index de0e1e3..4877f6f 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -12,7 +12,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - 'mojo_environment_chromium', + 'mojo_environment_standalone', 'mojo_gles2', 'mojo_gles2_bindings', 'mojo_native_viewport_bindings', |