Update merge_pgc_files.py in preparation for VS2017

build/win/merge_pgc_files.py

 #!/usr/bin/env python
 # Copyright 2017 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.
 
 """Merge the PGC files generated during the profiling step to the PGD database.
 
 This is required to workaround a flakyness in pgomgr.exe where it can run out
 of address space while trying to merge all the PGC files at the same time.
 """
 
 import glob
 import json
 import optparse
 import os
 import subprocess
 import sys
 
 
+script_dir = os.path.dirname(os.path.realpath(__file__))
+sys.path.insert(0, os.path.join(script_dir, os.pardir))
+
+import vs_toolchain
+
+
 def find_pgomgr(chrome_checkout_dir):
   """Find pgomgr.exe."""
   win_toolchain_json_file = os.path.join(chrome_checkout_dir, 'build',
       'win_toolchain.json')
   if not os.path.exists(win_toolchain_json_file):
     raise Exception('The toolchain JSON file is missing.')
   with open(win_toolchain_json_file) as temp_f:
     toolchain_data = json.load(temp_f)
   if not os.path.isdir(toolchain_data['path']):
     raise Exception('The toolchain JSON file is invalid.')
 
   # Always use the x64 version of pgomgr (the x86 one doesn't work on the bot's
   # environment).
-  pgomgr_dir = os.path.join(toolchain_data['path'], 'VC', 'bin', 'amd64')
+  if toolchain_data['version'] == '2015':
+    pgomgr_dir = os.path.join(toolchain_data['path'], 'VC', 'bin', 'amd64')
+  elif toolchain_data['version'] == '2017':
+    vc_tools_root = vs_toolchain.FindVCToolsRoot()
+    pgomgr_dir = os.path.join(vc_tools_root, 'HostX64', 'x64')
 
   pgomgr_path = os.path.join(pgomgr_dir, 'pgomgr.exe')
   if not os.path.exists(pgomgr_path):
     raise Exception('pgomgr.exe is missing from %s.' % pgomgr_dir)
 
   return pgomgr_path
 
 
 def main():
   parser = optparse.OptionParser(usage='%prog [options]')
@@ skipping 59 matching lines @@
     ])
     proc = subprocess.Popen(merge_command, stdout=subprocess.PIPE)
     stdout, stderr = proc.communicate()
     print stdout
     if proc.returncode != 0:
       raise Exception('Error while trying to merge the PGC files:\n%s' % stderr)
 
 
 if __name__ == '__main__':
   sys.exit(main())