[Chromoting] Fix remoting_host_installation wix actions.

remoting/remoting.gyp

 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
@@ skipping 464 matching lines @@
             'remoting_host_controller',
             'remoting_service',
             'remoting_me2me_host',
           ],
           'sources': [
             'host/installer/chromoting.wxs',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/chromoting.msi',
           ],
+          'wix_defines' : [
+            '"-dBranding=<(branding)"',
+          ],
           'conditions': [
             ['buildtype == "Official"', {
-              'variables': {
-                 'official_build': '-dOfficialBuild=1',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                 'official_build': '',
-              },
+              'wix_defines': [
+                '-dOfficialBuild=1',
+              ],
             }],
           ],
           'rules': [
             {
               'rule_name': 'candle',
               'extension': 'wxs',
               'inputs': [
                 '<(PRODUCT_DIR)/remoting_host_controller.exe',
                 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
                 '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(platformsdk_path)/redist/x86/sas.dll'
+                '<(platformsdk_path)/redist/x86/sas.dll',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
               ],
               'process_outputs_as_sources': 1,
               'msvs_cygwin_shell': 0,
               'msvs_quote_cmd': 0,
               'action': [
                 '"<(wix_path)\\candle"',
                 '-ext "<(wix_path)\\WixFirewallExtension.dll"',
                 '-ext "<(wix_path)\\WixUIExtension.dll"',
                 '-ext "<(wix_path)\\WixUtilExtension.dll"',
-                '-dVersion=<(version_full) '
-                '"-dFileSource=<(PRODUCT_DIR)." '
-                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
-                '<(official_build) '
-                '"-dBranding=<(branding)" '
+                '-dVersion=<(version_full)',
+                '"-dFileSource=<(PRODUCT_DIR)."',
+                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"',
+                '<@(_wix_defines)',
                 '-out <@(_outputs)',
                 '"<(RULE_INPUT_PATH)"',
               ],
               'message': 'Generating <@(_outputs)',
             },
             {
               'rule_name': 'light',
               'extension': 'wixobj',
               'inputs': [
                 '<(PRODUCT_DIR)/remoting_host_controller.exe',
                 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
                 '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(platformsdk_path)/redist/x86/sas.dll'
+                '<(platformsdk_path)/redist/x86/sas.dll',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
                 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb',
               ],
               'msvs_cygwin_shell': 0,
               'msvs_quote_cmd': 0,
               'action': [
                 '"<(wix_path)\\light"',
                 '-ext "<(wix_path)\\WixFirewallExtension.dll"',
                 '-ext "<(wix_path)\\WixUIExtension.dll"',
                 '-ext "<(wix_path)\\WixUtilExtension.dll"',
                 '-cultures:en-us',
-                '-dVersion=<(version_full) '
-                '"-dFileSource=<(PRODUCT_DIR)." '
-                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
-                '<(official_build) '
-                '"-dBranding=<(branding)" '
+                '-dVersion=<(version_full)',
+                '"-dFileSource=<(PRODUCT_DIR)."',
+                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"',
+                '<@(_wix_defines)',
                 '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"',
                 '"<(RULE_INPUT_PATH)"',
               ],
               'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
             },
           ],
         },  # end of target 'remoting_host_installation'
       ],  # end of 'targets'
     }],  # '<(wix_path) != ""'
 
@@ skipping 1066 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }