Instrument setup.exe in the SyzyAsan builds.

chrome/tools/build/win/create_installer_archive.py

Index: chrome/tools/build/win/create_installer_archive.py
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index 8c0f8144670e4e1116c04e62bb1d3578c32416dc..2e61bad05f000e6df601226afe223826fe04b18a 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -325,7 +325,7 @@ def PrepareSetupExec(options, current_version, prev_version):
            '/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
@@ -366,11 +366,10 @@ def CreateResourceInputFile(
                     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)
@@ -468,6 +467,19 @@ def ParseDLLsFromDeps(build_dir, runtime_deps_file):
       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.
@@ -479,39 +491,8 @@ def DoComponentBuildTasks(staging_dir, build_dir, target_arch,
   # 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
@@ -584,6 +565,9 @@ def main(options):
     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]