Copy local CRT DLLs to gn output directories

chrome/tools/build/win/create_installer_archive.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Script to create Chrome Installer archive.
 
   This script is used to create an archive of all the files required for a
   Chrome install in appropriate directory structure. It reads chrome.release
   file as input, creates chrome.7z archive, compresses setup.exe and
@@ skipping 440 matching lines @@
     # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/reference.md#GN-build-language-grammar
     m = re.match('^\s*is_debug\s*=\s*false(\s*$|\s*#.*$)', l)
     if m:
       return 'Release'
 
   # if is_debug is set to anything other than false, or if it
   # does not exist at all, we should use the default value (True).
   return 'Debug'
 
 
-# Copy the relevant CRT DLLs to |build_dir|. We copy DLLs from all versions
-# of VS installed to make sure we have the correct CRT version, unused DLLs
-# should not conflict with the others anyways.
-def CopyVisualStudioRuntimeDLLs(target_arch, build_dir):
-  is_debug = os.path.basename(build_dir).startswith('Debug')
-  if not is_debug and not os.path.basename(build_dir).startswith('Release'):
-    gn_type = _read_configuration_from_gn(build_dir)
-    if gn_type == 'Debug':
-      is_debug = True
-    elif gn_type == 'Release':
-      is_debug = False
-    else:
-      print ("Warning: could not determine build configuration from "
-             "output directory or args.gn, assuming Release build. If "
-             "setup.exe fails to launch, please check that your build "
-             "configuration is Release.")
-
-  crt_dlls = []
-  sys_dll_dir = None
-  if is_debug:
-    crt_dlls = glob.glob(
-        "C:/Program Files (x86)/Microsoft Visual Studio */VC/redist/"
-        "Debug_NonRedist/" + target_arch + "/Microsoft.*.DebugCRT/*.dll")
-  else:
-    crt_dlls = glob.glob(
-        "C:/Program Files (x86)/Microsoft Visual Studio */VC/redist/" +
-        target_arch + "/Microsoft.*.CRT/*.dll")
-
-  # Also handle the case where someone is building using only winsdk and
-  # doesn't have Visual Studio installed.
-  if not crt_dlls:
-    if target_arch == 'x64':
-      # check we are are on a 64bit system by existence of WOW64 dir
-      if os.access("C:/Windows/SysWOW64", os.F_OK):
-        sys_dll_dir = "C:/Windows/System32"
-      else:
-        # only support packaging of 64bit installer on 64bit system
-        # but this just as bad as not finding DLLs at all so we
-        # don't abort here to mirror behavior below
-        print ("Warning: could not find x64 CRT DLLs on x86 system.")
-    else:
-      # On a 64-bit system, 32-bit dlls are in SysWOW64 (don't ask).
-      if os.access("C:/Windows/SysWOW64", os.F_OK):
-        sys_dll_dir = "C:/Windows/SysWOW64"
-      else:
-        sys_dll_dir = "C:/Windows/System32"
-
-    if sys_dll_dir is not None:
-      if is_debug:
-        crt_dlls = glob.glob(os.path.join(sys_dll_dir, "msvc*0d.dll"))
-      else:
-        crt_dlls = glob.glob(os.path.join(sys_dll_dir, "msvc*0.dll"))
-
-  if not crt_dlls:
-    print ("Warning: could not find CRT DLLs to copy to build dir - target "
-           "may not run on a system that doesn't have those DLLs.")
-
-  for dll in crt_dlls:
-    CopyIfChanged(dll, build_dir)
-
-
 # Copies component build DLLs and generates required config files and manifests
 # in order for chrome.exe and setup.exe to be able to find those DLLs at
 # run-time.
 # This is meant for developer builds only and should never be used to package
 # an official build.
 def DoComponentBuildTasks(staging_dir, build_dir, target_arch, current_version):
   # Get the required directories for the upcoming operations.
   chrome_dir = os.path.join(staging_dir, CHROME_DIR)
   version_dir = os.path.join(chrome_dir, current_version)
   installer_dir = os.path.join(version_dir, 'Installer')
   # |installer_dir| is technically only created post-install, but we need it
   # now to add setup.exe's config and manifest to the archive.
   if not os.path.exists(installer_dir):
     os.mkdir(installer_dir)
 
-  # Copy the VS CRT DLLs to |build_dir|. This must be done before the general
-  # copy step below to ensure the CRT DLLs are added to the archive and marked
-  # as a dependency in the exe manifests generated below.
-  CopyVisualStudioRuntimeDLLs(target_arch, build_dir)
-
   # Explicitly list the component DLLs setup.exe depends on (this list may
   # contain wildcards). These will be copied to |installer_dir| in the archive.
   # The use of source sets in gn builds means that references to some extra
   # DLLs get pulled in to setup.exe (base_i18n.dll, ipc.dll, etc.). Unpacking
   # these to |installer_dir| is simpler and more robust than switching setup.exe
   # to use libraries instead of source sets.
   setup_component_dll_globs = [ 'api-ms-win-*.dll',
                                 'base.dll',
                                 'boringssl.dll',
                                 'crcrypto.dll',
                                 'icui18n.dll',
                                 'icuuc.dll',
                                 'msvc*.dll',
+                                'ucrtbase*.dll',
                                 'vcruntime*.dll',
                                 # DLLs needed due to source sets.
                                 'base_i18n.dll',
                                 'ipc.dll',
                                 'net.dll',
                                 'prefs.dll',
                                 'protobuf_lite.dll',
                                 'url_lib.dll' ]
   for setup_component_dll_glob in setup_component_dll_globs:
     setup_component_dlls = glob.glob(os.path.join(build_dir,
@@ skipping 160 matching lines @@
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   options = _ParseOptions()
   if options.verbose:
     print sys.argv
   sys.exit(main(options))