diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 02:06:08 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 02:06:08 +0000 |
| commit | 450a83680c63b8425f1fbd5cb3dc09547e831b2d (patch) | |
| tree | 0b53779f394c51dd2a106fb02464797832ca267a /chrome_frame/chrome_frame_launcher.gyp | |
| parent | caba14d54358444cfc4f96afa33ad509de07d941 (diff) | |
| download | chromium_src-450a83680c63b8425f1fbd5cb3dc09547e831b2d.zip chromium_src-450a83680c63b8425f1fbd5cb3dc09547e831b2d.tar.gz chromium_src-450a83680c63b8425f1fbd5cb3dc09547e831b2d.tar.bz2 | |
Reverting this as this breaks chrome frame tests everywhere. The problem is that the chrome frame
typelib is not part of chrome frame resources, which causes type library loads to fail. Please
fix and reland
Revert 73524 - Rework how chrome_tab.idl is processed for chrome_frame. This is to avoid the compiler (at least in VS2010) from needlessly trying to rebuild what is fine.
BUG=71130
TEST=Clean compile & usual tests.
Review URL: http://codereview.chromium.org/6260049
TBR=jeanluc@chromium.org
Review URL: http://codereview.chromium.org/6246062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_launcher.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index b70dff0..d357e88 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -134,7 +134,6 @@ 'msvs_guid': '5E80032F-7033-4661-9016-D98268244783', 'dependencies': [ '../chrome/chrome.gyp:chrome_version_header', - 'chrome_frame.gyp:chrome_tab_idl', ], 'resource_include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -142,7 +141,8 @@ ], 'include_dirs': [ # To allow including "chrome_tab.h" - '<(SHARED_INTERMEDIATE_DIR)', + '<(INTERMEDIATE_DIR)', + '<(INTERMEDIATE_DIR)/../chrome_frame', ], 'sources': [ 'bho_loader.cc', @@ -152,7 +152,8 @@ 'chrome_frame_helper_util.cc', 'chrome_frame_helper_util.h', 'chrome_frame_helper_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', + 'chrome_tab.h', + 'chrome_tab.idl', 'event_hooker.cc', 'event_hooker.h', 'iids.cc', |