Use runtime_deps to tell create_installer_archive what dlls to copy.

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'
 
 
+def ParseDLLsFromDeps(build_dir, runtime_deps_file):
+  """Parses the runtime_deps file and returns the set of DLLs in it, relative
+  to build_dir."""
+  build_dlls = set()
+  args = open(runtime_deps_file).read()
+  for l in args.splitlines():
+    if os.path.splitext(l)[1] == ".dll":
+      build_dlls.add(os.path.join(build_dir, l))
+  return build_dlls
+
 # 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):
+def DoComponentBuildTasks(staging_dir, build_dir, target_arch,
+                          setup_runtime_deps, component_runtime_deps,
+                          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)
 
-  # 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,
-                                                  setup_component_dll_glob))
-    if len(setup_component_dlls) == 0:
-      raise Exception('Error: missing expected DLL for component build '
-                      'mini_installer: "%s"' % setup_component_dll_glob)
-    for setup_component_dll in setup_component_dlls:
-      g_archive_inputs.append(setup_component_dll)
-      shutil.copy(setup_component_dll, installer_dir)
+  if setup_runtime_deps:
+    setup_component_dlls = ParseDLLsFromDeps(build_dir, setup_runtime_deps)
+  else:
+    # Explicitly list the component DLLs setup.exe depends on (this list may
+    # contain wildcards). These will be copied to |installer_dir| in the
+    # archive.
+    # TODO(jbauman): Remove when GYP is deprecated on Windows.
+    setup_component_dll_globs = [ 'api-ms-win-*.dll',
+                                  'base.dll',
+                                  'boringssl.dll',
+                                  'crcrypto.dll',
+                                  'icui18n.dll',
+                                  'icuuc.dll',
+                                  'msvc*.dll',
+                                  'ucrtbase*.dll',
+                                  'vcruntime*.dll', ]
+    setup_component_dlls = set()
+    for setup_component_dll_glob in setup_component_dll_globs:
+      setup_component_partial_dlls = glob.glob(
+          os.path.join(build_dir, setup_component_dll_glob))
+      if len(setup_component_partial_dlls) == 0:
+        raise Exception('Error: missing expected DLL for component build '
+                        'mini_installer: "%s"' % setup_component_dll_glob)
+      setup_component_dlls.update(setup_component_partial_dlls)
+  for setup_component_dll in setup_component_dlls:
+    g_archive_inputs.append(setup_component_dll)
+    shutil.copy(setup_component_dll, installer_dir)
 
-  # Stage all the component DLLs found in |build_dir| to the |version_dir| (for
+  # Stage all the component DLLs to the |version_dir| (for
   # the version assembly to be able to refer to them below and make sure
-  # chrome.exe can find them at runtime). The component DLLs are considered to
-  # be all the DLLs which have not already been added to the |version_dir| by
-  # virtue of chrome.release.
-  build_dlls = glob.glob(os.path.join(build_dir, '*.dll'))
+  # chrome.exe can find them at runtime), except the ones that are already
+  # staged (i.e. non-component DLLs).
+  if component_runtime_deps:
+    build_dlls = ParseDLLsFromDeps(build_dir, component_runtime_deps)
+  else:
+    # If no component_runtime_deps was specified, every DLL in build_dir is
+    # considered to be a component DLL.
+    # TODO(jbauman): Remove when GYP is deprecated on Windows.
+    build_dlls = glob.glob(os.path.join(build_dir, '*.dll'))
   staged_dll_basenames = [os.path.basename(staged_dll) for staged_dll in \
                           glob.glob(os.path.join(version_dir, '*.dll'))]
   component_dll_filenames = []
   for component_dll in [dll for dll in build_dlls if \
                         os.path.basename(dll) not in staged_dll_basenames]:
     component_dll_name = os.path.basename(component_dll)
     # ash*.dll remoting_*.dll's don't belong in the archive (it doesn't depend
     # on them in gyp). Trying to copy them causes a build race when creating the
     # installer archive in component mode. See: crbug.com/180996 and
     # crbug.com/586967
@@ skipping 39 matching lines @@
                              staging_dir, options.output_dir,
                              options.enable_hidpi)
 
   # Now copy the remainder of the files from the build dir.
   CopyAllFilesToStagingDir(config, options.distribution,
                            staging_dir, options.build_dir,
                            options.enable_hidpi)
 
   if options.component_build == '1':
     DoComponentBuildTasks(staging_dir, options.build_dir,
-                          options.target_arch, current_version)
+                          options.target_arch, options.setup_runtime_deps,
+                          options.component_runtime_deps, current_version)
 
   version_numbers = current_version.split('.')
   current_build_number = version_numbers[2] + '.' + version_numbers[3]
   prev_build_number = ''
   if prev_version:
     version_numbers = prev_version.split('.')
     prev_build_number = version_numbers[2] + '.' + version_numbers[3]
 
   # Name of the archive file built (for example - chrome.7z or
   # patch-<old_version>-<new_version>.7z or patch-<new_version>.7z
@@ skipping 42 matching lines @@
       help='Name used to prefix names of generated archives.')
   parser.add_option('--enable_hidpi', default='0',
       help='Whether to include HiDPI resource files.')
   parser.add_option('--component_build', default='0',
       help='Whether this archive is packaging a component build. This will '
            'also turn off compression of chrome.7z into chrome.packed.7z and '
            'helpfully delete any old chrome.packed.7z in |output_dir|.')
   parser.add_option('--depfile',
       help='Generate a depfile with the given name listing the implicit inputs '
            'to the archive process that can be used with a build system.')
+
+  # TODO(jbauman): Make --component_runtime_deps and --setup_runtime_deps
+  # mandatory when GYP is deprecated on Windows.
+  parser.add_option('--component_runtime_deps',
+      help='A file listing runtime dependencies. This will be used to get a '
+           'list of component build DLLs to archive.')

[gab, 2016/06/22 14:04:20]

s/to archive/to archive in a component build/

(here and below)

+  parser.add_option('--setup_runtime_deps',
+      help='A file listing runtime dependencies for setup.exe. This will be '
+           'used to get a list of component build DLLs to archive.')
   parser.add_option('--target_arch', default='x86',
       help='Specify the target architecture for installer - this is used '
            'to determine which CRT runtime files to pull and package '
            'with the installer archive {x86|x64}.')
   parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
                     default=False)
 
   options, _ = parser.parse_args()
   if not options.build_dir:
     parser.error('You must provide a build dir.')
@@ skipping 14 matching lines @@
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   options = _ParseOptions()
   if options.verbose:
     print sys.argv
   sys.exit(main(options))