| Index: chrome/installer/installer_tools.gyp
|
| diff --git a/chrome/installer/installer_tools.gyp b/chrome/installer/installer_tools.gyp
|
| index fea3d488be3f29e1d3addb8fa444d0b66db9220c..3033e218e64f5d76bdf47c24626ee7bb567d1fd0 100644
|
| --- a/chrome/installer/installer_tools.gyp
|
| +++ b/chrome/installer/installer_tools.gyp
|
| @@ -7,7 +7,7 @@
|
| 'version_py': '<(DEPTH)/build/util/version.py',
|
| 'version_path': '<(DEPTH)/chrome/VERSION',
|
| 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
|
| - # 'branding_dir' is set in the 'conditions' section at the bottom.
|
| + 'branding_dir': '<(DEPTH)/chrome/app/theme/<(branding_path_component)',
|
| 'msvs_use_common_release': 0,
|
| 'msvs_use_common_linker_extras': 0,
|
| },
|
| @@ -34,14 +34,5 @@
|
| },
|
| ],
|
| }],
|
| - [ 'branding == "Chrome"', {
|
| - 'variables': {
|
| - 'branding_dir': '<(DEPTH)/chrome/app/theme/google_chrome',
|
| - },
|
| - }, { # else branding!="Chrome"
|
| - 'variables': {
|
| - 'branding_dir': '<(DEPTH)/chrome/app/theme/chromium',
|
| - },
|
| - }],
|
| ],
|
| }
|
|
|