diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 20:46:11 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 20:46:11 +0000 |
| commit | c38c5530dc495fad8b318f9439f2fecba12a9c2e (patch) | |
| tree | 458281d3d839811c1ddad3000fb337bf39717732 /ui/aura/aura.gyp | |
| parent | c39151a170718795bbe5bf0db16cf69b9f9adc08 (diff) | |
| download | chromium_src-c38c5530dc495fad8b318f9439f2fecba12a9c2e.zip chromium_src-c38c5530dc495fad8b318f9439f2fecba12a9c2e.tar.gz chromium_src-c38c5530dc495fad8b318f9439f2fecba12a9c2e.tar.bz2 | |
aura: Add osmesa as dependency for aura_unittests on linux.
BUG=none
TEST=aura_unittests on linux
Review URL: http://codereview.chromium.org/8168006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/aura.gyp')
| -rw-r--r-- | ui/aura/aura.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 5b70c14..47823ec 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -96,7 +96,13 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], + # osmesa GL implementation is used on linux. 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', + ], + }], ['OS!="mac"', { 'dependencies': [ '../../chrome/chrome.gyp:packed_resources', |