Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: chrome/tools/crash_service/caps/caps.gyp

Issue 1114453002: use 'branding_path_component' to simplify branding in chrome directory - part 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
},
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698