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

Unified Diff: chrome/installer/mini_installer.gyp

Issue 1105633003: just some of possible refactorings possible after inventing branding_path_component (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/installer/installer_tools.gyp ('k') | chrome/installer/mini_installer_syzygy.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer.gyp
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index fdbd85d03a244a6157a9fcbc5940bd29a46886a0..a7f2aa949e7dc1f957a3ad0f91f622a6c355b9fc 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -3,7 +3,7 @@
'version_py': '<(DEPTH)/build/util/version.py',
'version_path': '../../chrome/VERSION',
'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
- # 'branding_dir' is set in the 'conditions' section at the bottom.
+ 'branding_dir': '../app/theme/<(branding_path_component)',
'msvs_use_common_release': 0,
'msvs_use_common_linker_extras': 0,
'mini_installer_internal_deps%': 0,
@@ -298,24 +298,6 @@
'message': 'Create installer archive',
},
],
- # TODO(mark): <(branding_dir) should be defined by the
- # global condition block at the bottom of the file, but
- # this doesn't work due to the following issue:
- #
- # http://code.google.com/p/gyp/issues/detail?id=22
- #
- # Remove this block once the above issue is fixed.
- 'conditions': [
- [ 'branding == "Chrome"', {
- 'variables': {
- 'branding_dir': '../app/theme/google_chrome',
- },
- }, { # else branding!="Chrome"
- 'variables': {
- 'branding_dir': '../app/theme/chromium',
- },
- }],
- ],
},
],
'conditions': [
@@ -338,14 +320,4 @@
}],
],
}],
- [ 'branding == "Chrome"', {
- 'variables': {
- 'branding_dir': '../app/theme/google_chrome',
- },
- }, { # else branding!="Chrome"
- 'variables': {
- 'branding_dir': '../app/theme/chromium',
- },
- }],
- ],
}
« no previous file with comments | « chrome/installer/installer_tools.gyp ('k') | chrome/installer/mini_installer_syzygy.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698