Instrument setup.exe in the SyzyAsan 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 307 matching lines @@
     setup_file = SETUP_PATCH_FILE_PREFIX + '_' + current_version + \
                  '_from_' + prev_version + COMPRESSED_FILE_EXT
     setup_file_path = os.path.join(options.build_dir, setup_file)
     CompressUsingLZMA(options.build_dir, setup_file_path, patch_file,
                       options.verbose)
   else:
     cmd = ['makecab.exe',
            '/D', 'CompressionType=LZX',
            '/V1',
            '/L', options.output_dir,
-           os.path.join(options.build_dir, SETUP_EXEC),]
+           os.path.join(options.output_dir, SETUP_EXEC),]
     RunSystemCommand(cmd, options.verbose)
     setup_file = SETUP_EXEC[:-1] + "_"
   return setup_file
 
 
 _RESOURCE_FILE_HEADER = """\
 // This file is automatically generated by create_installer_archive.py.
 // It contains the resource entries that are going to be linked inside
 // mini_installer.exe. For each file to be linked there should be two
 // lines:
@@ skipping 20 matching lines @@
     setup_resource_type = "B7"
 
   # An array of (file, type, path) tuples of the files to be included.
   resources = []
   resources.append((setup_file, setup_resource_type,
                     os.path.join(output_dir, setup_file)))
   resources.append((archive_file, 'B7',
                     os.path.join(output_dir, archive_file)))
   # Include all files needed to run setup.exe (these are copied into the
   # 'Installer' dir by DoComponentBuildTasks).
-  if component_build:
-    installer_dir = os.path.join(staging_dir, CHROME_DIR, current_version,
-                                 'Installer')
-    for file in os.listdir(installer_dir):
-      resources.append((file, 'BN', os.path.join(installer_dir, file)))

[grt (UTC plus 2), 2016/12/09 08:30:54]

this puts the component DLLs in as uncompressed blobs. for official
non-component SyzyASAN canaries, we may want the runtime to be LZX compressed
with makecab.exe as is the case with setup.exe (see PrepareSetupExec above). is
the runtime so small that it won't be a gain to compress? since setup.exe is
compressed for both component and non-component builds, i think it's likely okay
to compress all dependent dlls always rather than having extra logic to handle
component (developer-only) vs. official with SyzyASAN. i don't think there will
be a large build time cost, but maybe it's worth checking.

please search for COMPONENT_BUILD in mini_installer.cc. you'll see that the code
to extract these extra resources isn't included in official builds. that'll have
to change. for the sake of consistency, maybe it would be a good thing for setup
and all of its dependencies to be LZX compressed so that the handling can be
uniform both here and in mini_installer.cc.

[Sébastien Marchand, 2017/03/06 21:52:26]

Sure, if you think that all the dll dependencies should always be LZX compressed
then this could probably be done on a separate CL before this one.

syzyasan_rtl.dll is ~500ko, compressing it reduce its size to ~250ko.

What's your preference here? Should I split this CL in two (split the Syzyasan
part from the LZX compression stuff).

[grt (UTC plus 2), 2017/03/10 09:08:10]

Yeah, I think it's worth doing the compression. Do you have reason to think
250KB isn't work it?

+  installer_dir = os.path.join(staging_dir, CHROME_DIR, current_version,
+                               'Installer')
+  for file in os.listdir(installer_dir):
+    resources.append((file, 'BN', os.path.join(installer_dir, file)))
 
   with open(resource_file_path, 'w') as f:
     f.write(_RESOURCE_FILE_HEADER)
     for (file, type, path) in resources:
       f.write('\n%s  %s\n    "%s"\n' % (file, type, path.replace("\\","/")))
 
 
 # Reads |manifest_name| from |build_dir| and writes |manifest_name| to
 # |output_dir| with the same content plus |inserted_string| added just before
 # |insert_before|.
@@ skipping 77 matching lines @@
 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
 
+
+def CopySetupRuntimeDeps(build_dir, setup_runtime_deps, version_dir):
+  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)
+
+  setup_component_dlls = ParseDLLsFromDeps(build_dir, setup_runtime_deps)
+  for setup_component_dll in setup_component_dlls:
+    g_archive_inputs.append(setup_component_dll)
+    shutil.copy(setup_component_dll, installer_dir)
+

[grt (UTC plus 2), 2016/12/09 08:30:54]

nit: extra blank line

[Sébastien Marchand, 2017/03/06 21:52:26]

Done.

 # 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,
                           setup_runtime_deps, chrome_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)
 
-  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.

[grt (UTC plus 2), 2016/12/09 08:30:54]

w00t!

[gab, 2016/12/09 19:23:24]

@grt: re. does setup.exe use the version manifest trick? Not anymore, it's been
using this explicit list for while, and with GN
(https://codereview.chromium.org/2075863003) it uses an automatically generated
list of runtime deps :).

Also, to simplify further post-XP, we could do get rid of the version manifest
in favor of an application config (Win7+) http://crbug.com/581133

-    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)
+  CopySetupRuntimeDeps(build_dir, setup_runtime_deps, version_dir)
 
   # 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), except the ones that are already
   # staged (i.e. non-component DLLs).
   if chrome_runtime_deps:
     build_dlls = ParseDLLsFromDeps(build_dir, chrome_runtime_deps)
   else:
     # If no chrome_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.

[gab, 2016/12/09 19:23:24]

While you're here, also resolve this? :)

[gab, 2016/12/09 19:24:46]

Actually, cleaning up the post GYP era is slightly more work than belongs in
this CL. I'll ping jbauman to find an owner for this.

[gab, 2016/12/12 16:20:00]

FYI, jbauman took care of this in https://codereview.chromium.org/2556253009/ :)

[grt (UTC plus 2), 2016/12/12 20:12:32]

Thanks, Gab!

     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)
     # These 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
@@ skipping 41 matching lines @@
 
   # 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, options.setup_runtime_deps,
                           options.chrome_runtime_deps, current_version)
+  elif options.setup_runtime_deps:
+    CopySetupRuntimeDeps(options.build_dir, options.setup_runtime_deps,
+                         os.path.join(staging_dir, CHROME_DIR, 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 85 matching lines @@
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   options = _ParseOptions()
   if options.verbose:
     print sys.argv
   sys.exit(main(options))