| Index: chrome/tools/crash_service/caps/caps.gyp
|
| diff --git a/chrome/tools/crash_service/caps/caps.gyp b/chrome/tools/crash_service/caps/caps.gyp
|
| index 42fbead2040107e9a2e87277c709894e0555d73f..9379c520d018b6745d66ca370ee91bc798411e0c 100644
|
| --- a/chrome/tools/crash_service/caps/caps.gyp
|
| +++ b/chrome/tools/crash_service/caps/caps.gyp
|
| @@ -13,18 +13,8 @@
|
| {
|
| 'target_name': 'caps_resources',
|
| 'type': 'none',
|
| - 'conditions': [
|
| - ['branding == "Chrome"', {
|
| - 'variables': {
|
| - 'branding_path': '../../../app/theme/google_chrome/BRANDING',
|
| - },
|
| - }, { # else branding!="Chrome"
|
| - 'variables': {
|
| - 'branding_path': '../../../app/theme/chromium/BRANDING',
|
| - },
|
| - }],
|
| - ],
|
| 'variables': {
|
| + 'branding_path': '../../../app/theme/<(branding_path_component)/BRANDING',
|
| 'output_dir': 'caps',
|
| 'template_input_path': '../../../app/chrome_version.rc.version',
|
| },
|
|
|