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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/temp_gyp/googleurl.gyp

Issue 174535: Merge 23965 - Pulling new version of googleurl into the tree.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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
Download patch
« no previous file with comments | « DEPS ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/temp_gyp/googleurl.gyp
===================================================================
--- build/temp_gyp/googleurl.gyp (revision 24462)
+++ build/temp_gyp/googleurl.gyp (working copy)
@@ -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',
],
},
],
Property changes on: build\temp_gyp\googleurl.gyp
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/build/temp_gyp/googleurl.gyp:r69-2775
Merged /trunk/src/build/temp_gyp/googleurl.gyp:r23965
« no previous file with comments | « DEPS ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698