diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 22:09:45 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 22:09:45 +0000 |
| commit | faf2abf91884495e67cda446007e7bf25f0c6c8c (patch) | |
| tree | 0d4811dabca8617256fbb446e49bf00b27a0a236 | |
| parent | b86f90993939af7e5ea40c8dd2eae7c662aa2890 (diff) | |
| download | chromium_src-faf2abf91884495e67cda446007e7bf25f0c6c8c.zip chromium_src-faf2abf91884495e67cda446007e7bf25f0c6c8c.tar.gz chromium_src-faf2abf91884495e67cda446007e7bf25f0c6c8c.tar.bz2 | |
Remove a cut-and-paste dependency of chrome_exe_version.rc on
the LASTCHANGE file (which doesn't actually use the value), which
was causing unnecessary rebuilds of resources and chrome.exe.
Change the output intermediate directory to
<(SHARED_INTERMEDIATE_DIR)/chrome so the on-disk location matches
the name of the changed target (app => chrome).
BUG=none
TEST=successful build
Review URL: http://codereview.chromium.org/139007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18861 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 45a8a90..4838797 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2617,7 +2617,7 @@ 'app/chrome_exe_version.rc.version', ], 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/app', + '<(SHARED_INTERMEDIATE_DIR)/chrome', ], 'msvs_settings': { 'VCLinkerTool': { @@ -2641,8 +2641,6 @@ { 'action_name': 'version', 'variables': { - 'lastchange_path': - '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 'version_py': 'tools/build/version.py', 'version_path': 'VERSION', 'template_input_path': 'app/chrome_exe_version.rc.version', @@ -2662,17 +2660,15 @@ '<(template_input_path)', '<(version_path)', '<(branding_path)', - '<(lastchange_path)', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/app/chrome_exe_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_exe_version.rc', ], 'action': [ 'python', '<(version_py)', '-f', '<(version_path)', '-f', '<(branding_path)', - '-f', '<(lastchange_path)', '<(template_input_path)', '<@(_outputs)', ], |