diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:52:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:52:56 +0000 |
| commit | 2d82dcf22cddc77a40166322edab77dc33954e73 (patch) | |
| tree | af39277a75ea30040161b4f7f9eb07bcee95eb7e /chrome/chrome_exe.gypi | |
| parent | bbe8709f0bf10c10beebd86d85ed18cd5ff20a96 (diff) | |
| download | chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.zip chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.tar.gz chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.tar.bz2 | |
Revert 113676 - Attempt 2 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.
I reverted first attempt as it broke some browser_tests. I've
straightened that out in another patch, so this should be good go
again. TBR since it's the same patch as before.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8889022
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8873037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113683 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, |