summaryrefslogtreecommitdiffstats
path: root/build/temp_gyp
diff options
context:
space:
mode:
authorcira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 16:35:17 +0000
committercira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 16:35:17 +0000
commit8f2fc94a7bf7af3f820316aa32045ad74ccc7f29 (patch)
tree117fbd622058c65ead4e0e02f955b1aa9747c1da /build/temp_gyp
parent534c59086c951a0687fce53c2a8de49a2100867e (diff)
downloadchromium_src-8f2fc94a7bf7af3f820316aa32045ad74ccc7f29.zip
chromium_src-8f2fc94a7bf7af3f820316aa32045ad74ccc7f29.tar.gz
chromium_src-8f2fc94a7bf7af3f820316aa32045ad74ccc7f29.tar.bz2
Pulling new version of googleurl into the tree.
Fixing a net_unittest case that wasn't updated when googleurl code was changed (but not down integrated to chrome). BUG=5490 Review URL: http://codereview.chromium.org/174093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/temp_gyp')
-rw-r--r--build/temp_gyp/googleurl.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index db4043a..4f0dac0 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:gtestmain',
'../../third_party/icu38/icu38.gyp:icuuc',
],
'sources': [
@@ -71,6 +70,7 @@
'../../googleurl/src/url_parse_unittest.cc',
'../../googleurl/src/url_test_utils.h',
'../../googleurl/src/url_util_unittest.cc',
+ '../../googleurl/src/gurl_test_main.cc',
],
},
],