Fixes for Win toolchain isolate

infra/bots/isolate_win_toolchain.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
+"""Download an updated VS toolchain, isolate it, upload a CL to update Skia."""
+
+
 import argparse
 import json
 import os
 import shlex
 import shutil
 import subprocess
 import sys
 import utils
 
+import win_toolchain_utils
+
 
 REPO_CHROME = 'https://chromium.googlesource.com/chromium/src.git'
 REPO_SKIA = 'https://skia.googlesource.com/skia.git'
 
 
 def get_toolchain_dir(toolchain_dir_output):
   """Find the toolchain directory."""
   prefix = 'vs_path = '
   for line in toolchain_dir_output.splitlines():
     if line.startswith(prefix):
       return line[len(prefix):].strip('"')
   raise Exception('Unable to find toolchain dir in output:\n%s' % (
                   toolchain_dir_output))
 
 
 def gen_toolchain(chrome_path, msvs_version, isolate_file):
   """Update the VS toolchain, isolate it, and return the isolated hash."""
   with utils.chdir(chrome_path):
     subprocess.check_call([utils.GCLIENT, 'sync'])
+    depot_tools = subprocess.check_output([
+        'python', os.path.join('build', 'find_depot_tools.py')]).rstrip()
     with utils.git_branch():
       vs_toolchain_py = os.path.join('build', 'vs_toolchain.py')
       env = os.environ.copy()
       env['GYP_MSVS_VERSION'] = msvs_version
       subprocess.check_call(['python', vs_toolchain_py, 'update'], env=env)
       output = subprocess.check_output(['python', vs_toolchain_py,
                                         'get_toolchain_dir'], env=env).rstrip()
       src_dir = get_toolchain_dir(output)
+      # Mock out absolute paths in win_toolchain.json.
+      win_toolchain_utils.abstract(os.path.join('build', 'win_toolchain.json'),
+                                   os.path.dirname(depot_tools))
 
     # Isolate the toolchain. Assumes we're running on Windows, since the above
     # would fail otherwise.
-    rel_path = os.path.relpath(src_dir, os.path.dirname(isolate_file))
+    isolate_file_dirname = os.path.dirname(isolate_file)
+    toolchain_relpath = os.path.relpath(src_dir, isolate_file_dirname)
+    chrome_relpath = os.path.relpath(os.getcwd(), isolate_file_dirname)
+    depot_tools_relpath = os.path.relpath(depot_tools, isolate_file_dirname)
     isolate = os.path.join(
         os.curdir, 'tools', 'luci-go', 'win64', 'isolate.exe')
     isolate_cmd = [isolate, 'archive', '--quiet',
         '--isolate-server', 'https://isolateserver.appspot.com',
         '-i', isolate_file,
         '-s', 'win_toolchain_%s.isolated' % msvs_version,
-        '--extra-variable', 'WIN_TOOLCHAIN_DIR=%s' % rel_path]
+        '--extra-variable', 'WIN_TOOLCHAIN_DIR=%s' % toolchain_relpath,
+        '--extra-variable', 'DEPOT_TOOLS_DIR=%s' % depot_tools_relpath,
+        '--extra-variable', 'CHROME_DIR=%s' % chrome_relpath]
     isolate_out = subprocess.check_output(isolate_cmd).rstrip()
     return shlex.split(isolate_out)[0]
 
 
 def update_toolchain_file(skia_path, msvs_version, isolated_hash):
   """Edit the win_toolchain_hash file, upload a CL."""
   with utils.chdir(skia_path):
     with utils.git_branch():
       hash_file = os.path.join('infra', 'bots', 'win_toolchain_hash.json')
       with open(hash_file) as f:
@@ skipping 34 matching lines @@
       if not os.path.isdir(skia_path):
         utils.git_clone(REPO_SKIA, skia_path)
 
       isolated_hash = gen_toolchain(chrome_path, args.msvs_version,
                                     isolate_file)
       update_toolchain_file(skia_path, args.msvs_version, isolated_hash)
 
 
 if __name__ == '__main__':
   main()