diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 22:17:46 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 22:17:46 +0000 |
| commit | 41dd32d3fdb4f818dfc9130d5f5ff3be9616ebb1 (patch) | |
| tree | da6abf657f7e3d803900c72233e4900bac4fe057 /mojo/mojo_services.gypi | |
| parent | 562b7ad53bc7f66f97dd2fa757103cd607154306 (diff) | |
| download | chromium_src-41dd32d3fdb4f818dfc9130d5f5ff3be9616ebb1.zip chromium_src-41dd32d3fdb4f818dfc9130d5f5ff3be9616ebb1.tar.gz chromium_src-41dd32d3fdb4f818dfc9130d5f5ff3be9616ebb1.tar.bz2 | |
Adds dependency on osmesa
This is needed for tests that use the test compositor.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/333223008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_services.gypi')
| -rw-r--r-- | mojo/mojo_services.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi index e38cb26..211889c 100644 --- a/mojo/mojo_services.gypi +++ b/mojo/mojo_services.gypi @@ -359,7 +359,7 @@ 'dependencies': [ 'mojo_run_all_unittests', ], - }] + }], ], }, { @@ -515,6 +515,13 @@ 'services/public/cpp/view_manager/lib/view_manager_test_suite.h', 'services/public/cpp/view_manager/lib/view_manager_unittests.cc', ], + 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../third_party/mesa/mesa.gyp:osmesa', + ], + }], + ], }, { 'target_name': 'mojo_view_manager_unittests', |