diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 18:09:45 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 18:09:45 +0000 |
| commit | d55a76d023d7e2813170f7d04b554611861749ab (patch) | |
| tree | cbac5f7e7717dc4f52fa4ce8c341b73fae3ed03d /chrome/installer/installer.gyp | |
| parent | 39fbd8e44a232d61ccf690fd1b8109aa7d1b8d49 (diff) | |
| download | chromium_src-d55a76d023d7e2813170f7d04b554611861749ab.zip chromium_src-d55a76d023d7e2813170f7d04b554611861749ab.tar.gz chromium_src-d55a76d023d7e2813170f7d04b554611861749ab.tar.bz2 | |
Choose right installer strings based on branding.
BUG=11950
TEST=see bug 11950
Review URL: http://codereview.chromium.org/548081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/installer.gyp')
| -rw-r--r-- | chrome/installer/installer.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 28b46826..c75c7db 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -124,12 +124,13 @@ ], 'action': ['python', 'util/prebuild/create_string_rc.py', - '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'], + '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', + '<(branding)',], 'message': 'Generating resources from <(RULE_INPUT_PATH)', }, ], 'sources': [ - '../app/generated_resources.grd', + '../app/chromium_strings.grd', ], 'direct_dependent_settings': { 'include_dirs': [ |