diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 16:19:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 16:19:03 +0000 |
| commit | 72f08de6e66e8be7111eedab407f80e2ae2d9ae0 (patch) | |
| tree | 4072644471f259cfecc678f8297c3ba6adf2724d /ui/aura_shell/aura_shell.gyp | |
| parent | 51d83bdfd5c71099465fba1ae1abb684db6662e3 (diff) | |
| download | chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.zip chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.tar.gz chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.tar.bz2 | |
Attempt 3 at:
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.
Attempt 2 failed because of last minute changes to chrome_tests.gypi
that I didn't merge properly with. TBRing again.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8890050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113809 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', |