diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 06:06:08 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 06:06:08 +0000 |
| commit | c5814fb0aea28259df5a46ca0008de7bd01ee8dc (patch) | |
| tree | 7c2ae1c958fc4fed84747a6b9c6f83178ca57dcb /chrome | |
| parent | 426c6dc33cd392e52e9c665b59c6fe6ed900d411 (diff) | |
| download | chromium_src-c5814fb0aea28259df5a46ca0008de7bd01ee8dc.zip chromium_src-c5814fb0aea28259df5a46ca0008de7bd01ee8dc.tar.gz chromium_src-c5814fb0aea28259df5a46ca0008de7bd01ee8dc.tar.bz2 | |
Fix bustage (consistent output directory names for .rc file).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7e4b42b..7576759 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3836,7 +3836,7 @@ 'app/chrome_dll.rc', 'app/chrome_dll_main.cc', 'app/chrome_dll_resource.h', - '<(grit_out_dir)/chrome_dll_version/chrome_dll_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '../webkit/glue/resources/aliasb.cur', '../webkit/glue/resources/cell.cur', @@ -3877,7 +3877,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/chrome_dll_version', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version', ], }, 'actions': [ @@ -3908,7 +3908,7 @@ '<(lastchange_path)', ], 'outputs': [ - '<(grit_out_dir)/chrome_dll_version/chrome_dll_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', ], 'action': [ 'python', @@ -4058,7 +4058,7 @@ 'tools/build/win/precompiled_wtl.h', 'tools/build/win/precompiled_wtl.cc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_dll_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', # browser_tests_sources and browser_tests_source_win_specific are # defined in 'variables' at the top of the file. |