diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-23 03:43:26 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-23 03:43:26 +0000 |
| commit | 4e9c2776bd4578b301abb05f1dd5c02730f99c1f (patch) | |
| tree | e74c96d0c7e8b49a07f154c5cffd803918e96fc0 /ceee | |
| parent | 49d1cd949b1bd446a986e0b96c8fe342d13d9417 (diff) | |
| download | chromium_src-4e9c2776bd4578b301abb05f1dd5c02730f99c1f.zip chromium_src-4e9c2776bd4578b301abb05f1dd5c02730f99c1f.tar.gz chromium_src-4e9c2776bd4578b301abb05f1dd5c02730f99c1f.tar.bz2 | |
Working around library->library dependency issues by adding explicit
dependency on any static library's transitive dependency on a
code-generating target.
Some belt-and-suspenders stuff as well; shouldn't hurt.
BUG=63479
TEST=it builds
Review URL: http://codereview.chromium.org/5136004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/ie/common/common.gyp | 2 | ||||
| -rw-r--r-- | ceee/ie/plugin/bho/bho.gyp | 1 | ||||
| -rw-r--r-- | ceee/ie/plugin/scripting/scripting.gyp | 1 | ||||
| -rw-r--r-- | ceee/ie/plugin/toolband/toolband.gyp | 10 | ||||
| -rw-r--r-- | ceee/installer_dll/ceee_installer_dll.gyp | 1 | ||||
| -rw-r--r-- | ceee/testing/manual/ie_broker/call_broker/call_broker.gyp | 4 |
6 files changed, 14 insertions, 5 deletions
diff --git a/ceee/ie/common/common.gyp b/ceee/ie/common/common.gyp index 0790fb5..ce4e333 100644 --- a/ceee/ie/common/common.gyp +++ b/ceee/ie/common/common.gyp @@ -55,7 +55,9 @@ '../../../net/net.gyp:net_base', '../../../ceee/common/common.gyp:initializing_coclass', '../../../ceee/common/common.gyp:ceee_common', + # TODO(joi@chromium.org) Why? Can we remove? '../../../ceee/testing/utils/test_utils.gyp:test_utils', + '../../../ceee/testing/utils/test_utils.gyp:mshtml_mocks', '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', '<(DEPTH)/chrome_frame/chrome_frame.gyp:chrome_tab_idl', '../plugin/toolband/toolband.gyp:toolband_idl', diff --git a/ceee/ie/plugin/bho/bho.gyp b/ceee/ie/plugin/bho/bho.gyp index c38d820..5e6249f 100644 --- a/ceee/ie/plugin/bho/bho.gyp +++ b/ceee/ie/plugin/bho/bho.gyp @@ -16,6 +16,7 @@ 'dependencies': [ '../toolband/toolband.gyp:toolband_idl', '../../broker/broker.gyp:broker', + '../../broker/broker.gyp:broker_rpc_idl', '../../broker/broker.gyp:broker_rpc_lib', '../../common/common.gyp:ie_common', '../../common/common.gyp:ie_common_settings', diff --git a/ceee/ie/plugin/scripting/scripting.gyp b/ceee/ie/plugin/scripting/scripting.gyp index 9f6a866..0cfa271 100644 --- a/ceee/ie/plugin/scripting/scripting.gyp +++ b/ceee/ie/plugin/scripting/scripting.gyp @@ -21,6 +21,7 @@ '../toolband/toolband.gyp:toolband_idl', '../../../../base/base.gyp:base', '../../../../ceee/common/common.gyp:ceee_common', + '../../../../ceee/common/common.gyp:initializing_coclass', ], 'sources': [ 'base.js', diff --git a/ceee/ie/plugin/toolband/toolband.gyp b/ceee/ie/plugin/toolband/toolband.gyp index 0fa2693..7fb5529bfc 100644 --- a/ceee/ie/plugin/toolband/toolband.gyp +++ b/ceee/ie/plugin/toolband/toolband.gyp @@ -37,18 +37,22 @@ 'target_name': 'ceee_ie', 'type': 'shared_library', 'dependencies': [ + '../../broker/broker.gyp:broker_rpc_idl', '../../broker/broker.gyp:broker_rpc_lib', 'ceee_ie_lib', 'ie_toolband_common', 'toolband_idl', '../bho/bho.gyp:bho', '../scripting/scripting.gyp:scripting', + '../scripting/scripting.gyp:javascript_bindings', '../../common/common.gyp:ie_common_settings', '../../common/common.gyp:ie_guids', - '../../../../base/base.gyp:base', - '../../../../breakpad/breakpad.gyp:breakpad_handler', - '../../../../ceee/common/common.gyp:ceee_common', + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler', + '<(DEPTH)/ceee/common/common.gyp:ceee_common', + '<(DEPTH)/ceee/common/common.gyp:initializing_coclass', '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', + '<(DEPTH)/chrome_frame/chrome_frame.gyp:chrome_tab_idl', ], 'sources': [ 'resource.h', diff --git a/ceee/installer_dll/ceee_installer_dll.gyp b/ceee/installer_dll/ceee_installer_dll.gyp index a23e61d..20026a1 100644 --- a/ceee/installer_dll/ceee_installer_dll.gyp +++ b/ceee/installer_dll/ceee_installer_dll.gyp @@ -18,6 +18,7 @@ '../../base/base.gyp:base', '../../chrome/chrome.gyp:common', '../../ceee/common/common.gyp:ceee_common', + '../../ceee/common/common.gyp:initializing_coclass', '../../ceee/ie/common/common.gyp:ie_common', '../firefox/firefox.gyp:xpi', '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', diff --git a/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp b/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp index 96eb49c..83e149a 100644 --- a/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp +++ b/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp @@ -17,10 +17,10 @@ '_CONSOLE', ], 'dependencies': [ - '<(DEPTH)/ceee/ie/plugin/toolband/toolband.gyp:toolband_idl', - '<(DEPTH)/ceee/ie/common/common.gyp:ie_common', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/ceee/common/common.gyp:ceee_common', + '<(DEPTH)/ceee/ie/plugin/toolband/toolband.gyp:toolband_idl', + '<(DEPTH)/ceee/ie/common/common.gyp:ie_common', ], }, ] |