From b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Wed, 7 Dec 2011 21:35:43 +0000 Subject: 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 --- ui/aura_shell/aura_shell.gyp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'ui/aura_shell/aura_shell.gyp') 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', -- cgit v1.1