diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 15:51:00 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 15:51:00 +0000 |
| commit | eacaf240e4852d599af41cca2e51279a25c59937 (patch) | |
| tree | 9231f29a26e3822653655ffed1aa66b70258703c /gfx/gfx.gyp | |
| parent | fff369b8be4e7df5af4f9c2cedd29234248fd35b (diff) | |
| download | chromium_src-eacaf240e4852d599af41cca2e51279a25c59937.zip chromium_src-eacaf240e4852d599af41cca2e51279a25c59937.tar.gz chromium_src-eacaf240e4852d599af41cca2e51279a25c59937.tar.bz2 | |
Fix the circular dependency between gfx and app. This temporarily disables the Direct2D test while I fix this.
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/gfx.gyp')
| -rw-r--r-- | gfx/gfx.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp index 359e668..ada400e 100644 --- a/gfx/gfx.gyp +++ b/gfx/gfx.gyp @@ -17,7 +17,6 @@ 'dependencies': [ 'gfx', 'gfx_resources', - '../app/app.gyp:app_base', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -42,7 +41,8 @@ 'conditions': [ ['OS=="win"', { 'sources': [ - 'canvas_direct2d_unittest.cc', + # TODO(brettw) re-enable this when the dependencies on WindowImpl are fixed! + #'canvas_direct2d_unittest.cc', 'icon_util_unittest.cc', 'native_theme_win_unittest.cc', ], |