| 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)"',
|
| ],
|
|
|