base/base.gyp - Issue 113938: Readd the gmock unittest example from the build as it causes link errors in XP Modules. - Code Review

Chromium Code Reviews

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

(1132)

My Issues | Starred Open | Closed | All

Unified Diff: base/base.gyp

Issue 113938: Readd the gmock unittest example from the build as it causes link errors in XP Modules. (Closed)

Patch Set: 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/base.gyp

diff --git a/base/base.gyp b/base/base.gyp

index e4a0b1742cbd56ea6d15b737e483eeca3f496275..a294726e1945972dd9aed9f2df1c1b47dbfc9bbe 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': [

« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698