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 /chrome/chrome_exe.gypi | |
| 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 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 4f7edcc..d2f2206 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -42,6 +42,11 @@ 'INFOPLIST_FILE': 'app/app-Info.plist', }, 'conditions': [ + ['use_aura==1 and use_webkit_compositor==0', { + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:test_compositor', + ], + }], ['OS == "android"', { # Don't put the 'chrome' target in 'all' on android 'suppress_wildcard': 1, |