Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3003)

Unified Diff: base/base.gyp

Issue 113807: Checkin a version of gmock, modified to use our boost_tuple in VS2005. (Closed)
Patch Set: Fix grammar issue. Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/gmock_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index aa168c14bf5e47bbc13e4d4c8ef9775e0ad495f0..a294726e1945972dd9aed9f2df1c1b47dbfc9bbe 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -590,16 +590,12 @@
'type': 'executable',
'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC',
'sources': [
- 'crypto/signature_verifier_unittest.cc',
- 'gfx/jpeg_codec_unittest.cc',
- 'gfx/native_theme_unittest.cc',
- 'gfx/png_codec_unittest.cc',
- 'gfx/rect_unittest.cc',
'at_exit_unittest.cc',
'atomicops_unittest.cc',
'clipboard_unittest.cc',
'command_line_unittest.cc',
'condition_variable_unittest.cc',
+ 'crypto/signature_verifier_unittest.cc',
'data_pack_unittest.cc',
'debug_util_unittest.cc',
'directory_watcher_unittest.cc',
@@ -608,6 +604,11 @@
'file_path_unittest.cc',
'file_util_unittest.cc',
'file_version_info_unittest.cc',
+ 'gfx/jpeg_codec_unittest.cc',
+ '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': [
« no previous file with comments | « no previous file | base/gmock_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698