diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 07:23:16 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 07:23:16 +0000 |
| commit | ce3157104a4975420535e31741dd82fa9f3df4a9 (patch) | |
| tree | 3d8b2b8c80612b8c4f5666ab9bb4fb0f4440cb02 /base/base.gyp | |
| parent | a1ef316742215bf4f6b9bb664b6dea1cf82cb067 (diff) | |
| download | chromium_src-ce3157104a4975420535e31741dd82fa9f3df4a9.zip chromium_src-ce3157104a4975420535e31741dd82fa9f3df4a9.tar.gz chromium_src-ce3157104a4975420535e31741dd82fa9f3df4a9.tar.bz2 | |
Readd the gmock unittest example from the build as it causes link errors in XP Modules.
Learned how to do a clobber build so retrying with that. Hope springs eternal.
Original Review URL: http://codereview.chromium.org/113807
Review URL: http://codereview.chromium.org/113938
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp index e4a0b17..a294726 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -608,6 +608,7 @@ 'gfx/native_theme_unittest.cc', 'gfx/png_codec_unittest.cc', 'gfx/rect_unittest.cc', + 'gmock_unittest.cc', 'histogram_unittest.cc', 'hmac_unittest.cc', 'idletimer_unittest.cc', @@ -673,6 +674,7 @@ 'base', 'base_gfx', '../skia/skia.gyp:skia', + '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], 'conditions': [ |