diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 15:37:33 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 15:37:33 +0000 |
| commit | 8ca280e9a3c5df4013776bb8d0218b44a092f6ea (patch) | |
| tree | 068aac125e5b267d17dc8c87c915b8f7f2fa6848 /chrome_frame/chrome_frame_launcher.gyp | |
| parent | 8f323d604253480c1be59a74f05f7df528274c27 (diff) | |
| download | chromium_src-8ca280e9a3c5df4013776bb8d0218b44a092f6ea.zip chromium_src-8ca280e9a3c5df4013776bb8d0218b44a092f6ea.tar.gz chromium_src-8ca280e9a3c5df4013776bb8d0218b44a092f6ea.tar.bz2 | |
Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a globally common output folder. It's rude to dump things in the root of the dir that aren't used project-wide.
Also explicitly list the installer -> ChromeFrame dependency in src\chrome\installer\DEPS. It was already present but now check_deps catches it due to the correctly formatted include path.Remove several redundant instances of SHARED_INTERMEDIATE_DIR being added to the include lists.
BUG=97185
TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/
Review URL: http://codereview.chromium.org/8317018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_launcher.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index 87be09c..98974ea 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -68,10 +68,6 @@ '../google_update/google_update.gyp:google_update', 'chrome_frame.gyp:chrome_frame_utils', ], - 'resource_include_dirs': [ - '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)', - ], 'sources': [ 'chrome_launcher_main.cc', 'chrome_launcher_version.rc', @@ -100,15 +96,6 @@ 'chrome_frame_helper_dll', 'chrome_frame_helper_lib', ], - 'resource_include_dirs': [ - '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'include_dirs': [ - # To allow including "chrome_tab.h" - '<(INTERMEDIATE_DIR)', - '<(INTERMEDIATE_DIR)/../chrome_frame', - ], 'sources': [ 'chrome_frame_helper_main.cc', 'chrome_frame_helper_version.rc', @@ -127,25 +114,16 @@ 'type': 'shared_library', 'dependencies': [ '../chrome/chrome.gyp:chrome_version_header', + 'chrome_frame.gyp:chrome_tab_idl', 'chrome_frame_helper_lib', ], - 'resource_include_dirs': [ - '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'include_dirs': [ - # To allow including "chrome_tab.h" - '<(INTERMEDIATE_DIR)', - '<(INTERMEDIATE_DIR)/../chrome_frame', - ], 'sources': [ 'bho_loader.cc', 'bho_loader.h', 'chrome_frame_helper_dll.cc', 'chrome_frame_helper_dll.def', 'chrome_frame_helper_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', - 'chrome_tab.idl', + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 'event_hooker.cc', 'event_hooker.h', 'iids.cc', @@ -164,23 +142,14 @@ 'type': 'static_library', 'dependencies': [ '../chrome/chrome.gyp:chrome_version_header', - ], - 'resource_include_dirs': [ - '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'include_dirs': [ - # To allow including "chrome_tab.h" - '<(INTERMEDIATE_DIR)', - '<(INTERMEDIATE_DIR)/../chrome_frame', + 'chrome_frame.gyp:chrome_tab_idl', ], 'sources': [ 'chrome_frame_helper_util.cc', 'chrome_frame_helper_util.h', 'registry_watcher.cc', 'registry_watcher.h', - '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', - 'chrome_tab.idl', + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 'iids.cc', ], 'msvs_settings': { |