summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 52a4b4fb..ddf2fe2 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',
- '../chrome/chrome.gyp:browser',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:common',
+ '../chrome/chrome.gyp:utility',
+ '../chrome/chrome.gyp:browser',
'../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:IAccessible2Proxy',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+ '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
'../third_party/libxslt/libxslt.gyp:libxslt',
- '../url/url.gyp:url',
'chrome_frame_ie',
'chrome_frame_strings',
'chrome_frame_utils',
@@ -328,8 +328,9 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
- '../chrome/chrome.gyp:browser',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:common',
+ '../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:debugger',
'../chrome/chrome.gyp:image_pre_reader',
'../chrome/chrome.gyp:test_support_common',
@@ -340,7 +341,6 @@
'../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/bzip2/bzip2.gyp:bzip2',
'../third_party/libxml/libxml.gyp:libxml',
- '../url/url.gyp:url',
+ '../third_party/bzip2/bzip2.gyp:bzip2',
'../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',