diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 21:35:43 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 21:35:43 +0000 |
| commit | b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16 (patch) | |
| tree | 091dc999bbd3c803e97b21e5e979e2cb5db7c8a0 /ui/aura_shell/aura_shell.gyp | |
| parent | 26197b3fbb55dd2e011b65434822e8ee52f2386c (diff) | |
| download | chromium_src-b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16.zip chromium_src-b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16.tar.gz chromium_src-b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16.tar.bz2 | |
Makes tests either use mock compositor or mock WebGraphicsContext3D depending upon which compositor we're running. This is needed to enable ui tests on the bots.
BUG=104360
TEST=none
Review URL: http://codereview.chromium.org/8805033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/aura_shell.gyp')
| -rw-r--r-- | ui/aura_shell/aura_shell.gyp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp index 2e1d430..fc4f0d1 100644 --- a/ui/aura_shell/aura_shell.gyp +++ b/ui/aura_shell/aura_shell.gyp @@ -135,7 +135,6 @@ '../aura/aura.gyp:aura', '../aura/aura.gyp:test_support_aura', '../gfx/compositor/compositor.gyp:compositor_test_support', - '../gfx/compositor/compositor.gyp:test_compositor', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -170,6 +169,17 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', ], + 'conditions': [ + ['use_webkit_compositor==1', { + 'dependencies': [ + '../gfx/compositor/compositor.gyp:compositor', + ], + }, { # use_webkit_compositor!=1 + 'dependencies': [ + '../gfx/compositor/compositor.gyp:test_compositor', + ], + }], + ], }, { 'target_name': 'aura_shell_exe', |