diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 05:05:13 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 05:05:13 +0000 |
| commit | 33e428dc48fd99228353e10a5a7e28b3b824b36f (patch) | |
| tree | b9f69194156085ec5bb80ba4597bccbab966d537 /chrome/installer/installer.gyp | |
| parent | 7cbb005a28e8c86a2e9ee162add900d0ff15635c (diff) | |
| download | chromium_src-33e428dc48fd99228353e10a5a7e28b3b824b36f.zip chromium_src-33e428dc48fd99228353e10a5a7e28b3b824b36f.tar.gz chromium_src-33e428dc48fd99228353e10a5a7e28b3b824b36f.tar.bz2 | |
Capture additional gyp settings for setup.exe:
* Consistent use of <(SHARED_INTERMEDIATE_DIR)/setup for the
output directory of the generated setup_exe_version.rc file.
* Add setup/setup_util.{cc,h}.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125237
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/installer.gyp')
| -rw-r--r-- | chrome/installer/installer.gyp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 7974765..e10ec50 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -460,8 +460,13 @@ 'include_dirs': [ '../..', '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)/setup', ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/setup', + ], + }, 'sources': [ 'mini_installer/chrome.release', 'setup/install.cc', @@ -474,6 +479,8 @@ 'setup/setup_constants.h', 'setup/setup_exe_version.rc.version', 'setup/setup_resource.h', + 'setup/setup_util.cc', + 'setup/setup_util.h', 'setup/uninstall.cc', 'setup/uninstall.h', ], @@ -497,7 +504,7 @@ '<(branding_dir)/BRANDING', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/setup_exe_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/setup/setup_exe_version.rc', ], 'action': [ 'python', '<(version_py)', |