summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-28 19:12:28 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-28 19:12:28 +0000
commit5e8c6691bace726b64c76ba4fdc68c3ea0a1a325 (patch)
tree68f517b9c4bd6a23af53efe97936124b4d94412e /printing
parent2feb19b125ef3fd6bebef1b5eefd08e92523d897 (diff)
downloadchromium_src-5e8c6691bace726b64c76ba4fdc68c3ea0a1a325.zip
chromium_src-5e8c6691bace726b64c76ba4fdc68c3ea0a1a325.tar.gz
chromium_src-5e8c6691bace726b64c76ba4fdc68c3ea0a1a325.tar.bz2
Revert "gtest shouldn't link in gtest_main.cc, as that provides its own main()."
This reverts commit r14755. Ugh, Windows build uses some gyp and some not. :( git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/printing.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp
index baa6341..51768fd 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -46,7 +46,6 @@
'dependencies': [
'printing',
'../testing/gtest.gyp:gtest',
- '../testing/gtest.gyp:main',
],
'sources': [
'units_unittest.cc',