Enable x64 Chromoting host and installer

N.B. I had to move the sawbuck_provider in the .wxs out of the
installation directory. Even though it only contains registry changes,
candle will complain if it is not inside a directory, but the
application directory is platform specific, whereas sawbuck_provider is
always 32-bit.

BUG=394467

Review URL: https://codereview.chromium.org/398173002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284007 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -563,7 +563,6 @@
       # that are missing.
       'test_isolation_fail_on_missing': 0,
 
-      'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
       'wix_path%': '<(DEPTH)/third_party/wix',
 
       # Managed users are enabled by default.
@@ -957,6 +956,14 @@
         ['OS=="win" or OS=="mac"', {
             'enable_wifi_bootstrapping%' : 1,
         }],
+
+        # Path to sas.dll, which provides the SendSAS function.
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs.85).aspx
+        ['target_arch=="x64"', {
+          'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/amd64',
+        }, {
+          'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
+        }],
       ],
 
       # Set this to 1 to enable use of concatenated impulse responses

remoting/host/installer/win/chromoting.wxs

@@ -18,6 +18,12 @@
     <?define Manufacturer = "The Chromium Authors" ?>
   <?endif?>
 
+  <?if $(sys.BUILDARCH) = "x64" ?>
+    <?define ProgramFilesFolderForPlatform = "ProgramFiles64Folder" ?>
+  <?else?>
+    <?define ProgramFilesFolderForPlatform = "ProgramFilesFolder" ?>
+  <?endif?>
+
   <?if $(var.OfficialBuild) != 0 ?>
     <?define ChromotingKeyPath = "Google\Chrome Remote Desktop" ?>
   <?else?>
@@ -134,7 +140,7 @@
     <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="$(var.ProgramFilesFolderForPlatform)">
         <?if $(var.OfficialBuild) != 0 ?>
           <Directory Id="program_files_google" Name="Google">
             <Directory Id="chromoting" Name="Chrome Remote Desktop">
@@ -567,8 +573,24 @@
         <CreateFolder/>
       </Component>
 
-      <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. -->
-      <Component Id="sawbuck_provider" Guid="*">
+      <!-- Delete the usagestats flag to reset the crash dump reporting settings
+           for existing users. -->
+      <Component Id="delete_usagestats"
+                 Guid="5c73f2b9-b865-426f-81cc-90a27ebb54aa"
+                 KeyPath="yes">
+        <Condition>BROKENUSAGESTATSVERSION</Condition>
+        <RemoveRegistryValue
+            Id="usagestats"
+            Key="SOFTWARE\Google\Update\ClientStateMedium\$(var.OmahaAppid)"
+            Name="usagestats"
+            Root="HKLM" />
+      </Component>
+
+    </DirectoryRef>
+
+    <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. -->
+    <DirectoryRef Id="TARGETDIR">
+      <Component Id="sawbuck_provider" Guid="*" Win64="no">
         <RegistryKey Root="HKLM"
                      Key="SOFTWARE\Google\Sawbuck\Providers">
           <RegistryKey Key="{2db51ca1-4fd8-4b88-b5a2-fb8606b66b02}"
@@ -587,20 +609,6 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-
-      <!-- Delete the usagestats flag to reset the crash dump reporting settings
-           for existing users. -->
-      <Component Id="delete_usagestats"
-                 Guid="5c73f2b9-b865-426f-81cc-90a27ebb54aa"
-                 KeyPath="yes">
-        <Condition>BROKENUSAGESTATSVERSION</Condition>
-        <RemoveRegistryValue
-            Id="usagestats"
-            Key="SOFTWARE\Google\Update\ClientStateMedium\$(var.OmahaAppid)"
-            Name="usagestats"
-            Root="HKLM" />
-      </Component>
-
     </DirectoryRef>
 
     <DirectoryRef Id="config_files">

remoting/remoting_host_win.gypi

@@ -502,6 +502,7 @@
                 'python', 'tools/zip2msi.py',
                 '--wix_path', '<(wix_path)',
                 '--intermediate_dir', '<(INTERMEDIATE_DIR)/installation',
+                '--target_arch', '<(target_arch)',
                 '<(RULE_INPUT_PATH)',
                 '<@(_outputs)',
               ],

remoting/tools/zip2msi.py

@@ -227,6 +227,19 @@ def GenerateMsi(target, source, 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)
@@ -247,6 +260,7 @@ def main():
   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')