Fix mini_installer in gn component builds

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 479 matching lines @@
   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.
-  setup_component_dll_globs = [ 'base.dll',
+  # 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',
-                                'api-ms-win-*.dll',
-                                'vcruntime*.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))
     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
   # 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
@@ skipping 149 matching lines @@
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   options = _ParseOptions()
   if options.verbose:
     print sys.argv
   sys.exit(main(options))