Temporary fix for telemetry builds

build/win/reorder-imports.py

Index: build/win/reorder-imports.py
diff --git a/build/win/reorder-imports.py b/build/win/reorder-imports.py
index d320b51e9e7cc6d39445ef06fabd753375839e29..09f62aa67eb47c7c082baa0582de2990ef6ca6d3 100755
--- a/build/win/reorder-imports.py
+++ b/build/win/reorder-imports.py
@@ -6,6 +6,7 @@
 import glob
 import optparse
 import os
+import platform
 import shutil
 import subprocess
 import sys
@@ -18,11 +19,16 @@ def reorder_imports(input_dir, output_dir):
   input_image = '--input-image=%s' % (os.path.join(input_dir, 'chrome.exe'))
   output_image = '--output-image=%s' % (os.path.join(output_dir, 'chrome.exe'))
 
-  swap_exe = os.path.join(
-      __file__,
-      '..\\..\\..\\third_party\\syzygy\\binaries\\exe\\swapimport.exe')
-  subprocess.call(
-      [swap_exe, input_image, output_image, '--overwrite', 'chrome_elf.dll'])
+  # TODO(caitkp): Remove this once swapimport works on x64 builds.
+  if platform.architecture()[0] == '64bit':

[scottmg, 2014/01/19 22:33:33]

I don't thing this will work. It's testing the architecture of the python binary
(which will always be 32bit anyway), not the build that's being built.

You'll need <(target_arch) from the gyp file.

+    shutil.copy(os.path.join(input_dir, 'chrome.exe'),
+        os.path.join(output_dir, 'chrome.exe'))
+  else:
+    swap_exe = os.path.join(
+        __file__,
+        '..\\..\\..\\third_party\\syzygy\\binaries\\exe\\swapimport.exe')
+    subprocess.call(
+        [swap_exe, input_image, output_image, '--overwrite', 'chrome_elf.dll'])
 
   for fname in glob.iglob(os.path.join(input_dir, 'chrome.exe.*')):
     shutil.copy(fname, os.path.join(output_dir, os.path.basename(fname)))