summaryrefslogtreecommitdiffstats
path: root/testing/gtest.gyp
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:59:23 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:59:23 +0000
commit016498e87cb7aa827bf53856ee4822966cac821c (patch)
tree73ef8c279d681a8ed80a1769082a59416fb2279b /testing/gtest.gyp
parent48737d2776fe57409cefb27e6bec25ac2fa7d125 (diff)
downloadchromium_src-016498e87cb7aa827bf53856ee4822966cac821c.zip
chromium_src-016498e87cb7aa827bf53856ee4822966cac821c.tar.gz
chromium_src-016498e87cb7aa827bf53856ee4822966cac821c.tar.bz2
scons: excise more scons references from the code base
I got to undo some hacks, too! TEST=compiles Review URL: http://codereview.chromium.org/5535003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
-rw-r--r--testing/gtest.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index da95f42..c0be091 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -108,9 +108,7 @@
},
},
{
- # Note that calling this "gtest_main" confuses the scons build,
- # which uses "_main" on scons files to produce special behavior.
- 'target_name': 'gtestmain',
+ 'target_name': 'gtest_main',
'type': '<(library)',
'dependencies': [
'gtest',