diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 19:12:28 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 19:12:28 +0000 |
| commit | 5e8c6691bace726b64c76ba4fdc68c3ea0a1a325 (patch) | |
| tree | 68f517b9c4bd6a23af53efe97936124b4d94412e /build/temp_gyp | |
| parent | 2feb19b125ef3fd6bebef1b5eefd08e92523d897 (diff) | |
| download | chromium_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 'build/temp_gyp')
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index d5d0ea7..b518e4c 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -62,7 +62,6 @@ 'dependencies': [ 'googleurl', '../../testing/gtest.gyp:gtest', - '../../testing/gtest.gyp:main', '../../third_party/icu38/icu38.gyp:icuuc', ], 'sources': [ |