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

Unified Diff: chrome_frame/chrome_frame.gyp

Issue 14089011: Roll the DEPS for google-url. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort chrome_tests.gypi Created 7 years, 8 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 | « chrome/chrome_tests.gypi ('k') | cloud_print/service/service.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame.gyp
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index ddf2fe28402c7569aa3d1ed48190244e3c20b60b..52a4b4fb935d7c857f172b338e85f62d3a035806 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -214,22 +214,22 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:test_support_base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../chrome/chrome.gyp:common',
- '../chrome/chrome.gyp:utility',
'../chrome/chrome.gyp:browser',
+ '../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:renderer',
'../chrome/chrome.gyp:test_support_common',
+ '../chrome/chrome.gyp:utility',
'../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib',
'../content/content.gyp:content_gpu',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
+ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/libxslt/libxslt.gyp:libxslt',
+ '../url/url.gyp:url',
'chrome_frame_ie',
'chrome_frame_strings',
'chrome_frame_utils',
@@ -328,9 +328,8 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:browser',
+ '../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:image_pre_reader',
'../chrome/chrome.gyp:test_support_common',
@@ -341,6 +340,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/libxslt/libxslt.gyp:libxslt',
+ '../url/url.gyp:url',
'chrome_frame_ie',
'chrome_frame_strings',
'chrome_frame_utils',
@@ -562,13 +562,13 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:test_support_base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:test_support_common',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+ '../url/url.gyp:url',
'chrome_frame_ie',
'chrome_frame_strings',
'chrome_tab_idl',
@@ -682,14 +682,14 @@
'chrome_frame_utils',
'chrome_tab_idl',
'locales/locales.gyp:*',
- '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/app/policy/cloud_policy_codegen.gyp:policy',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:utility',
'../content/content.gyp:content_common',
'../net/net.gyp:net',
- '../third_party/libxml/libxml.gyp:libxml',
'../third_party/bzip2/bzip2.gyp:bzip2',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../url/url.gyp:url',
'../webkit/support/webkit_support.gyp:user_agent',
],
'sources': [
@@ -885,11 +885,11 @@
'chrome_frame_launcher.gyp:chrome_frame_helper',
'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
'locales/locales.gyp:*',
- '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:chrome_dll',
'../chrome/chrome.gyp:chrome_version_resources',
'../chrome/chrome.gyp:common',
+ '../url/url.gyp:url',
],
'defines': [
'_WINDLL',
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | cloud_print/service/service.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698