Add x86 to copy_cdb_to_output Allowed Architectures

build/win/copy_cdb_to_output.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 import hashlib
 import os
 import shutil
 import sys
 
@@ skipping 30 matching lines @@
     if os.path.exists(target):
       os.unlink(target)
     shutil.copy(source, target)
 
 
 def _CopyCDBToOutput(output_dir, target_arch):
   """Copies the Windows debugging executable cdb.exe to the output
   directory, which is created if it does not exist. The output
   directory, and target architecture that should be copied, are
   passed. Supported values for the target architecture are the GYP
-  values "ia32" and "x64".
+  values "ia32" and "x64" and the GN values "x86" and "x64".
   """
   if not os.path.isdir(output_dir):
     os.makedirs(output_dir)
   vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
   win_sdk_dir = os.path.normpath(os.environ['WINDOWSSDKDIR'])
-  if target_arch == 'ia32':
+  if target_arch == 'ia32' or target_arch == 'x86':
     src_arch = 'x86'
   elif target_arch == 'x64':
     src_arch = 'x64'
   else:
     print 'copy_cdb_to_output.py: unknown target_arch %s' % target_arch
     sys.exit(1)
   # We need to copy multiple files, so cache the computed source directory.
   src_dir = os.path.join(win_sdk_dir, 'Debuggers', src_arch)
   # Note that the outputs from the "copy_cdb_to_output" target need to
   # be kept in sync with this list.
   _CopyImpl('cdb.exe', output_dir, src_dir)
   _CopyImpl('dbgeng.dll', output_dir, src_dir)
   _CopyImpl('dbghelp.dll', output_dir, src_dir)
   _CopyImpl('dbgmodel.dll', output_dir, src_dir)
   return 0
 
 
 def main():
   if len(sys.argv) < 2:
     print >>sys.stderr, 'Usage: copy_cdb_to_output.py <output_dir> ' + \
         '<target_arch>'
     return 1
   return _CopyCDBToOutput(sys.argv[1], sys.argv[2])
 
 
 if __name__ == '__main__':
   sys.exit(main())