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

Unified Diff: remoting/remoting.gyp

Issue 10081026: Chromoting Host installation should take into account both buildtype% and branding%. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « remoting/host/installer/chromoting.wxs ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 6221af0c1a2701ca36bf168c4bd5b56d4f3f3efa..1010e06a27165fc0c6a5ee8c13ec3b4818ea92ec 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -414,13 +414,13 @@
'<(PRODUCT_DIR)/chromoting.msi',
],
'conditions': [
- ['branding == "Chrome"', {
+ ['buildtype == "Official"', {
'variables': {
- 'branding': '-dOfficialBuild=1',
+ 'official_build': '-dOfficialBuild=1',
},
}, { # else branding!="Chrome"
'variables': {
- 'branding': '',
+ 'official_build': '',
},
}],
],
@@ -448,7 +448,8 @@
'-dVersion=<(version_full) '
'"-dFileSource=<(PRODUCT_DIR)." '
'"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
- '<(branding) '
+ '<(official_build) '
+ '"-dBranding=<(branding)" '
'-out <@(_outputs)',
'"<(RULE_INPUT_PATH)"',
],
@@ -478,7 +479,8 @@
'-dVersion=<(version_full) '
'"-dFileSource=<(PRODUCT_DIR)." '
'"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
- '<(branding) '
+ '<(official_build) '
+ '"-dBranding=<(branding)" '
'-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"',
'"<(RULE_INPUT_PATH)"',
],
« no previous file with comments | « remoting/host/installer/chromoting.wxs ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698