diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:47:23 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:47:23 +0000 |
| commit | f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4 (patch) | |
| tree | 150c11094e8caceea5f315df11bcf6073e1e1f45 /chrome_frame/chrome_frame_launcher.gyp | |
| parent | 26be3c7afc6c1ab32edd302ff13c61530ee88c34 (diff) | |
| download | chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.zip chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.tar.gz chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.tar.bz2 | |
Revert 105803 - 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.
BUG=97185
TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/
Review URL: http://codereview.chromium.org/8150002
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/8318013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_launcher.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index 1fa61e7..87be09c 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -104,6 +104,11 @@ '<(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', @@ -128,13 +133,18 @@ '<(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_frame/chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'chrome_tab.idl', 'event_hooker.cc', 'event_hooker.h', @@ -159,12 +169,17 @@ '<(INTERMEDIATE_DIR)', '<(SHARED_INTERMEDIATE_DIR)', ], + 'include_dirs': [ + # To allow including "chrome_tab.h" + '<(INTERMEDIATE_DIR)', + '<(INTERMEDIATE_DIR)/../chrome_frame', + ], 'sources': [ 'chrome_frame_helper_util.cc', 'chrome_frame_helper_util.h', 'registry_watcher.cc', 'registry_watcher.h', - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'chrome_tab.idl', 'iids.cc', ], |