| Index: chrome_frame/chrome_frame.gyp
|
| diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
|
| index 3a805c45264f2a8905bf625771d9c3adcff2ac90..f7bf02ae58cf5c493fa7ad9c1d06175c76ccf4a8 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_lib',
|
| '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_lib',
|
| 'chrome_frame_ie',
|
| 'chrome_frame_strings',
|
| 'chrome_frame_utils',
|
| @@ -562,7 +562,6 @@
|
| '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',
|
| @@ -570,6 +569,7 @@
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
|
| '../third_party/protobuf/protobuf.gyp:protobuf_lite',
|
| + '../url/url.gyp:url_lib',
|
| 'chrome_frame_ie',
|
| 'chrome_frame_strings',
|
| 'chrome_tab_idl',
|
| @@ -678,19 +678,19 @@
|
| 'target_name': 'chrome_frame_ie',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'chrome_frame_common',
|
| - 'chrome_frame_strings',
|
| - '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',
|
| + '../url/url.gyp:url_lib',
|
| '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
|
| + 'chrome_frame_common',
|
| + 'chrome_frame_strings',
|
| + 'chrome_frame_utils',
|
| + 'chrome_tab_idl',
|
| + 'locales/locales.gyp:*',
|
| ],
|
| 'sources': [
|
| 'bho.cc',
|
| @@ -876,20 +876,20 @@
|
| 'type': 'shared_library',
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| + '../chrome/chrome.gyp:chrome',
|
| + '../chrome/chrome.gyp:chrome_dll',
|
| + '../chrome/chrome.gyp:chrome_version_resources',
|
| + '../chrome/chrome.gyp:common',
|
| + '../url/url.gyp:url_lib',
|
| 'chrome_frame_ie',
|
| + 'chrome_frame_launcher.gyp:chrome_frame_helper',
|
| + 'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
|
| + 'chrome_frame_launcher.gyp:chrome_launcher',
|
| 'chrome_frame_strings',
|
| 'chrome_frame_utils',
|
| 'chrome_frame_version_resources',
|
| 'chrome_tab_idl',
|
| - 'chrome_frame_launcher.gyp:chrome_launcher',
|
| - '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',
|
| ],
|
| 'defines': [
|
| '_WINDLL',
|
|
|