diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:56:31 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:56:31 +0000 |
| commit | 973d44a198f2fa9314ecbe43b06f0a7d622dfc7e (patch) | |
| tree | 4065dfa54da57bfc46f7f7fbcbd13001a31eafb6 /chrome/chrome_exe.gypi | |
| parent | 023caca1556db34fef0b98bb484b39c653758755 (diff) | |
| download | chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.zip chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.tar.gz chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.tar.bz2 | |
Revert 113470 - 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
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8873001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index d2f2206..4f7edcc 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -42,11 +42,6 @@ '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, |