diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 14:56:27 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 14:56:27 +0000 |
| commit | c6864137ab07105215f78f1d7a6826c71c7b8c34 (patch) | |
| tree | 45891556a322bf65fb3707d80893be1664555cc9 /chrome_frame/chrome_frame_launcher.gyp | |
| parent | d44e159ed4e83cdeb233bdcc55b3b38b00fe0837 (diff) | |
| download | chromium_src-c6864137ab07105215f78f1d7a6826c71c7b8c34.zip chromium_src-c6864137ab07105215f78f1d7a6826c71c7b8c34.tar.gz chromium_src-c6864137ab07105215f78f1d7a6826c71c7b8c34.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.
BUG=97185
TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/
Review URL: http://codereview.chromium.org/8150002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105803 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, 2 insertions, 17 deletions
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index 87be09c..1fa61e7 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -104,11 +104,6 @@ '<(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', @@ -133,18 +128,13 @@ '<(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', + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 'chrome_tab.idl', 'event_hooker.cc', 'event_hooker.h', @@ -169,17 +159,12 @@ '<(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_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', 'chrome_tab.idl', 'iids.cc', ], |