chrome_frame/chrome_frame_launcher.gyp - Issue 8317018: Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a global...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/chrome_frame_launcher.gyp

Issue 8317018: Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a global... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome_frame/chrome_frame_launcher.gyp

===================================================================

--- chrome_frame/chrome_frame_launcher.gyp (revision 105823)

+++ chrome_frame/chrome_frame_launcher.gyp (working copy)

@@ -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',

+ 'chrome_frame.gyp:chrome_tab_idl',

- '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_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': {

« no previous file with comments | « chrome_frame/chrome_frame_helper_util.cc ('k') | chrome_frame/chrome_protocol.h » ('j') | chrome_frame/resources/tlb_resource.rc » ('J')