diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 18:31:25 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 18:31:25 +0000 |
| commit | d7534d5e16158e750ccb23792bc6855d49c6e2d2 (patch) | |
| tree | 2c0893107fc0d785a41177b95ccef6fe17802742 /chrome/installer/installer.gyp | |
| parent | a1db3d453bb9a10f5a9c13bc2de1917e5324f1d6 (diff) | |
| download | chromium_src-d7534d5e16158e750ccb23792bc6855d49c6e2d2.zip chromium_src-d7534d5e16158e750ccb23792bc6855d49c6e2d2.tar.gz chromium_src-d7534d5e16158e750ccb23792bc6855d49c6e2d2.tar.bz2 | |
Revert r36640 "Choose right installer strings based on branding."
This reverts commit 4a533e019a51b12a0b027243a06da6ee6b2bc49a.
Review URL: http://codereview.chromium.org/548089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/installer.gyp')
| -rw-r--r-- | chrome/installer/installer.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index c75c7db..28b46826 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -124,13 +124,12 @@ ], 'action': ['python', 'util/prebuild/create_string_rc.py', - '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', - '<(branding)',], + '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'], 'message': 'Generating resources from <(RULE_INPUT_PATH)', }, ], 'sources': [ - '../app/chromium_strings.grd', + '../app/generated_resources.grd', ], 'direct_dependent_settings': { 'include_dirs': [ |