Instrument setup.exe in the SyzyAsan builds.

chrome/installer/mini_installer/BUILD.gn

Index: chrome/installer/mini_installer/BUILD.gn
diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
index 5d2fe25007f571db95ac3232c0cec08602391e94..5cabc854ac8a595117e19ceceac0966531948c38 100644
--- a/chrome/installer/mini_installer/BUILD.gn
+++ b/chrome/installer/mini_installer/BUILD.gn
@@ -79,27 +79,38 @@ source_set("unit_tests") {
 
 # The runtime deps are used to tell create_installer_archive what component
 # DLLs need to be packaged in a component build.
-chrome_runtime_deps = "$root_gen_dir/chrome_component.runtime_deps"
-setup_runtime_deps = "$root_gen_dir/setup.runtime_deps"
+chrome_runtime_deps_path = "$root_gen_dir/chrome_component.runtime_deps"
+setup_runtime_deps_path = "$root_gen_dir/setup.runtime_deps"
+setup_syzygy_runtime_deps_path = "$root_gen_dir/setup_syzygy.runtime_deps"
 
 group("chrome_runtime_deps") {
-  write_runtime_deps = chrome_runtime_deps
+  write_runtime_deps = chrome_runtime_deps_path
   data_deps = [
     "//chrome",
   ]
 }
 
 group("setup_runtime_deps") {
-  write_runtime_deps = setup_runtime_deps
+  write_runtime_deps = setup_runtime_deps_path
   data_deps = [
     "//chrome/installer/setup",
   ]
 }
 
+group("setup_syzygy_runtime_deps") {
+  write_runtime_deps = setup_syzygy_runtime_deps_path
+  deps = [
+    ":setup_runtime_deps",
+  ]
+  data_deps = [
+    "//build/win/syzygy:copy_syzyasan_runtime_binaries",
+  ]
+}
+
 # Generates a mini installer.
 #
-#   out_dir (required)
-#     The output directory out_dir where the mini_installer image should be
+#   output_dir (required)
+#     The output directory where the mini_installer image should be
 #     written.
 #
 #   chrome_dll_file (required)
@@ -109,27 +120,40 @@ group("setup_runtime_deps") {
 #   chrome_dll_target (required)
 #     The target that generated chrome_dll_file.
 #
-#   deps (required)
+#   setup_exe_file (required)
+#     The path to the version of setup.exe that should be included in the
+#     installer archive.
+#
+#   setup_exe_target (required)
+#     The target that generated setup_exe_file.
+#
+#   deps
 #     Normal meaning.
 template("generate_mini_installer") {
-  chrome_dll_file = invoker.chrome_dll_file
-  chrome_dll_target = invoker.chrome_dll_target
-  output_dir = invoker.out_dir
-
+  forward_variables_from(invoker,
+                         [
+                           "output_dir",
+                           "chrome_dll_file",
+                           "chrome_dll_target",
+                           "setup_exe_file",
+                           "setup_exe_target",
+                           "setup_runtime_deps",
+                         ])
   packed_files_rc_file = "$target_gen_dir/$target_name/packed_files.rc"
   archive_name = target_name + "_archive"
   staging_dir = "$target_gen_dir/$target_name"
 
   action(archive_name) {
+    forward_variables_from(invoker, [ "deps" ])
     script = "//chrome/tools/build/win/create_installer_archive.py"
 
     release_file = "chrome.release"
 
     inputs = [
       "$chrome_dll_file",
+      "$setup_exe_file",
       "$root_out_dir/chrome.exe",
       "$root_out_dir/locales/en-US.pak",
-      "$root_out_dir/setup.exe",
       release_file,
     ]
 
@@ -153,7 +177,7 @@ template("generate_mini_installer") {
       "--output_dir",
       rebase_path(output_dir, root_build_dir),
       "--chrome_runtime_deps",
-      rebase_path(chrome_runtime_deps, root_build_dir),
+      rebase_path(chrome_runtime_deps_path, root_build_dir),
       "--setup_runtime_deps",
       rebase_path(setup_runtime_deps, root_build_dir),
 
@@ -166,14 +190,16 @@ template("generate_mini_installer") {
       #'--verbose',
     ]
 
-    deps = [
+    if (!defined(deps)) {
+      deps = []
+    }
+    deps += [
       ":chrome_runtime_deps",
-      ":setup_runtime_deps",
       "//chrome",
       "//chrome/browser/extensions/default_extensions",
-      "//chrome/installer/setup",
       "//third_party/icu:icudata",
       chrome_dll_target,
+      setup_exe_target,
     ]
 
     if (enable_hidpi) {
@@ -264,16 +290,28 @@ template("generate_mini_installer") {
 }
 
 generate_mini_installer("mini_installer") {
-  out_dir = root_out_dir
+  output_dir = root_out_dir
   chrome_dll_file = "$root_out_dir/chrome.dll"
   chrome_dll_target = "//chrome:main_dll"
+  setup_exe_file = "$root_out_dir/setup.exe"
+  setup_exe_target = "//chrome/installer/setup"
+  setup_runtime_deps = setup_runtime_deps_path
+  deps = [
+    ":setup_runtime_deps",
+  ]
 }
 
 if (is_syzyasan) {
   generate_mini_installer("mini_installer_syzygy") {
-    out_dir = "$root_out_dir/syzygy/"
+    output_dir = "$root_out_dir/syzygy/"
     chrome_dll_file = "$root_out_dir/syzygy/chrome.dll"
     chrome_dll_target = "//chrome/tools/build/win/syzygy:chrome_dll_syzygy"
+    setup_exe_file = "$root_out_dir/syzygy/setup.exe"
+    setup_exe_target = "//chrome/tools/build/win/syzygy:setup_syzygy"
+    setup_runtime_deps = setup_syzygy_runtime_deps_path
+    deps = [
+      ":setup_syzygy_runtime_deps",
+    ]
   }
 }