Enable x64 Chromoting host and installer

remoting/tools/zip2msi.py

 #!/usr/bin/env python
 # 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.
 
 """Generates .msi from a .zip archive or an unpacked directory.
 
 The structure of the input archive or directory should look like this:
 
   +- archive.zip
@@ skipping 209 matching lines @@
   if 'bind_path' not in parameters:
     print 'The binding path is not specified'
     return 1
 
   wxs = os.path.join(source_dir, parameters['source'])
 
   #  Add the binding path to the light-specific parameters.
   bind_path = os.path.join(source_dir, parameters['bind_path'])
   parameters = Merge(parameters, {'light': {'switches': ['-b', bind_path]}})
 
+  target_arch = parameters['target_arch']
+  if target_arch == 'ia32':
+    arch_param = 'x86'
+  elif target_arch == 'x64':
+    arch_param = 'x64'
+  else:
+    print 'Invalid target_arch parameter value'
+    return 1
+
+  # Add the architecture to candle-specific parameters.
+  parameters = Merge(
+      parameters, {'candle': {'switches': ['-arch', arch_param]}})
+
   # Run candle and light to generate the installation.
   wixobj = '%(intermediate_dir)s\\%(basename)s.wixobj' % parameters
   args = GenerateCommandLine('candle', wxs, wixobj, parameters)
   rc = Run(args)
   if rc:
     return rc
 
   args = GenerateCommandLine('light', wixobj, target, parameters)
   rc = Run(args)
   if rc:
     return rc
 
   return 0
 
 
 def main():
   usage = 'Usage: zip2msi [options] <input.zip> <output.msi>'
   parser = OptionParser(usage=usage)
   parser.add_option('--intermediate_dir', dest='intermediate_dir', default='.')
   parser.add_option('--wix_path', dest='wix_path', default='.')
+  parser.add_option('--target_arch', dest='target_arch', default='x86')
   options, args = parser.parse_args()
   if len(args) != 2:
     parser.error('two positional arguments expected')
 
   return GenerateMsi(args[1], args[0], dict(options.__dict__))
 
 if __name__ == '__main__':
   sys.exit(main())