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 /chrome/chrome_dll.gypi | |
| 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 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 75c0164..aa4ac07 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -16,6 +16,15 @@ 'app/policy/cloud_policy_codegen.gyp:policy', ], 'conditions': [ + ['use_webkit_compositor==1', { + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:compositor', + ], + }, { # use_webkit_compositor!=1 + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:test_compositor', + ], + }], ['OS=="win"', { 'product_name': 'chrome', 'dependencies': [ |