Update toolchain script to package SDK 8.1 instead of 8.0

win_toolchain/toolchain2013.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Extracts a Windows VS2013 toolchain from various downloadable pieces."""
 
 
 import ctypes
 import json
@@ skipping 326 matching lines @@
   return result
 
 
 def CopyToFinalLocation(extracted_dirs, target_dir):
   sys.stdout.write('Copying to final location...\n')
   mappings = {
       'Program Files\\Microsoft Visual Studio 12.0\\VC\\': 'VC\\',
       'Program Files\\Microsoft Visual Studio 12.0\\DIA SDK\\': 'DIA SDK\\',
       'System64\\': 'sys64\\',
       'System\\': 'sys32\\',
-      'Windows Kits\\8.0\\': 'win8sdk\\',
+      'Windows Kits\\8.1\\': 'win8sdk\\',
       'WinDDK\\7600.16385.win7_wdk.100208-1538\\': 'wdk\\',
   }
   matches = []
   for extracted_dir in extracted_dirs:
     for root, _, filenames in os.walk(extracted_dir):
       for filename in filenames:
         matches.append((extracted_dir, os.path.join(root, filename)))
 
   copies = []
   for prefix, full_path in matches:
@@ skipping 33 matching lines @@
     # host at all).
     if pro:
       f.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;'
                 '%~dp0..\\..\\VC\\bin\\amd64_x86;'
                 '%~dp0..\\..\\VC\\bin\\amd64;'  # Needed for mspdb120.dll.
                 '%PATH%\n')
     else:
       f.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;'
                 '%~dp0..\\..\\VC\\bin;%PATH%\n')
     f.write('set LIB=%~dp0..\\..\\VC\\lib;'
-               '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x86;'
+               '%~dp0..\\..\\win8sdk\\Lib\\winv6.3\\um\\x86;'
                '%~dp0..\\..\\VC\\atlmfc\\lib\n'
             'goto :EOF\n')
 
     # Express does not include a native 64 bit compiler, so we have to use
     # the x86->x64 cross.
     if not pro:
       # x86->x64 cross.
       f.write(':x64\n'
               'set PATH=%~dp0..\\..\\win8sdk\\bin\\x64;'
                  '%~dp0..\\..\\VC\\bin\\x86_amd64;'
                  # Needed for mspdb120.dll. Must be after above though, so
                  # that cl.exe is the x86_amd64 one.
                  '%~dp0..\\..\\VC\\bin;'
                  '%PATH%\n')
     else:
       # x64 native.
       f.write(':x64\n'
               'set PATH=%~dp0..\\..\\win8sdk\\bin\\x64;'
                  '%~dp0..\\..\\VC\\bin\\amd64;'
                  '%PATH%\n')
     f.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;'
-               '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x64;'
+               '%~dp0..\\..\\win8sdk\\Lib\\winv6.3\\um\\x64;'
                '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n')
 
 
 def DoTreeMirror(target_dir, tree_sha1):
   """In order to save temporary space on bots that do not have enough space to
   download ISOs, unpack them, and copy to the target location, the whole tree
   is uploaded as a zip to internal storage, and then mirrored here."""
   local_zip = DownloadUsingGsutil(tree_sha1 + '.zip')
   sys.stdout.write('Extracting %s...\n' % local_zip)
   sys.stdout.flush()
@@ skipping 51 matching lines @@
     }
     with open(os.path.join(target_dir, '..', 'data.json'), 'w') as f:
       json.dump(data, f)
   finally:
     if options.clean:
       DeleteAllTempDirs()
 
 
 if __name__ == '__main__':
   sys.exit(main())