summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorsgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 18:03:24 +0000
committersgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 18:03:24 +0000
commit9ccb18d691f7f70292ed19a83dc1381f9baeea97 (patch)
tree3f75c5a12a8eda9fa0105785c6016be4d59d524a /chrome/installer
parent5039b7a3c5ba113c73ad0aca238c164c67a8805a (diff)
downloadchromium_src-9ccb18d691f7f70292ed19a83dc1381f9baeea97.zip
chromium_src-9ccb18d691f7f70292ed19a83dc1381f9baeea97.tar.gz
chromium_src-9ccb18d691f7f70292ed19a83dc1381f9baeea97.tar.bz2
Fix installer_util_string's expected output file to match what
create_string_rc.py actually creates. BUG=none TEST=none Review URL: http://codereview.chromium.org/203031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/installer.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index be5dc87..68eaa8f 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -190,7 +190,11 @@
'<(RULE_INPUT_PATH)',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/<(RULE_INPUT_ROOT).h',
+ # Don't use <(RULE_INPUT_ROOT) to create the output file
+ # name, because the base name of the input
+ # (generated_resources.grd) doesn't match the generated file
+ # (installer_util_strings.h).
+ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
],
'action': ['python',
'util/prebuild/create_string_rc.py',