Add the mini_installer_syzygy GN target.

chrome/tools/build/win/syzygy/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 declare_args() {
   # Generate Syzygy optimized binaries. Syzygy optimize mode is a profile
@@ skipping 11 matching lines @@
 if (syzygy_optimize) {
   # Generates a Syzygy optimize target.
   #
   #   dll_name (required)
   #     Name of the DLL to be instrumented, with no extension or path. This
   #     ${dll_name}.dll is assumed to be in the output directory and must be
   #     generated by a dependency of this target.
   #
   #   deps (required)
   #     Normal meaning.
+  #
+  #   data_deps
+  #     Normal meaning.
   template("syzygy_optimize") {
     action(target_name) {
       if (defined(invoker.visibility)) {
         visibility = invoker.visibility
       }
       script = "//chrome/tools/build/win/syzygy/reorder.py"
 
       dll_name = invoker.dll_name
       input_dll = "$root_out_dir/$dll_name.dll"
       input_pdb = "$root_out_dir/$dll_name.dll.pdb"
@@ skipping 10 matching lines @@
 
       args = [
         "--input_executable",
         rebase_path(input_dll, root_build_dir),
         "--input_symbol",
         rebase_path(input_pdb, root_build_dir),
         "--destination_dir",
         rebase_path(syzygy_dest_dir, root_build_dir),
       ]
 
       if (defined(invoker.deps)) {

[brettw, 2016/06/24 23:51:43]

You can replace both of these defined checks with:
  forward_variables_from(invoker, ["deps", "public_deps" "data_deps"])
(I added public_deps for completeness)

[Dirk Pranke, 2016/06/25 22:53:57]

Acknowledged.

         deps = invoker.deps
       }
+
+      if (defined(invoker.data_deps)) {
+        data_deps = invoker.data_deps
+      }
     }
   }
 
   syzygy_optimize("chrome_dll_syzygy") {
     dll_name = "chrome"
     deps = [
       "//chrome:main_dll",
     ]
+    if (is_multi_dll_chrome) {
+      data_deps = [
+        ":chrome_child_dll_syzygy",
+      ]
+    }
   }
   if (is_multi_dll_chrome) {
     # Also instrument chrome_child.dll.
     syzygy_optimize("chrome_child_dll_syzygy") {
       dll_name = "chrome_child"
       deps = [
         "//chrome:chrome_child",
       ]
     }
   }
 } else if (is_syzyasan) {
   # Instruments a binary with SyzyAsan.
   #
-  #   dll_name (required)
-  #     Name of the DLL to be instrumented, with no extension or path. This
-  #     ${dll_name}.dll is assumed to be in the output directory and must be
+  #   binary_name (required)
+  #     Name of the binary to be instrumented, with no extension or path. This
+  #     ${binary_name} is assumed to be in the output directory and must be

[brettw, 2016/06/24 23:51:43]

Just delete the $ and {} on this now (before it was trying to say it appended
".dll" to what you gave it).

[Dirk Pranke, 2016/06/25 22:53:57]

Acknowledged.

   #     generated by a dependency of this target.
   #
+  #   dest_dir (required)
+  #     The destination directory where the instrumented image should be
+  #     written.
+  #
   #   deps (required)
   #     Normal meaning.
+  #
+  #   public_deps
+  #     Normal meaning.
+  #
+  #   data_deps
+  #     Normal meaning.
   template("syzygy_asan") {
     action(target_name) {
       if (defined(invoker.visibility)) {
         visibility = invoker.visibility
       }
       script = "//chrome/tools/build/win/syzygy/instrument.py"
 
       filter = "syzyasan-instrumentation-filter.txt"
 
-      dll_name = invoker.dll_name
-      input_dll = "$root_out_dir/$dll_name.dll"
-      input_pdb = "$root_out_dir/$dll_name.dll.pdb"
+      binary_name = invoker.binary_name
+      dest_dir = invoker.dest_dir
+      input_image = "$root_out_dir/$binary_name"
+      input_pdb = "$root_out_dir/$binary_name.pdb"
 
       inputs = [
         filter,
-        input_dll,
+        input_image,
 
         #input_pdb,
       ]
 
-      output_filter = "$syzygy_dest_dir/win-syzyasan-filter-$dll_name.txt.json"
+      output_filter = "$dest_dir/win-syzyasan-filter-$binary_name.txt.json"
 
       outputs = [
-        "$syzygy_dest_dir/$dll_name.dll",
-        "$syzygy_dest_dir/$dll_name.dll.pdb",
+        "$dest_dir/$input_image",
+        "$dest_dir/$input_image.pdb",
         output_filter,
       ]
 
       args = [
         "--mode",
         "asan",
         "--input_executable",
-        rebase_path(input_dll, root_build_dir),
+        rebase_path(input_image, root_build_dir),
         "--input_symbol",
         rebase_path(input_pdb, root_build_dir),
         "--filter",
         rebase_path(filter, root_build_dir),
         "--output-filter-file",
         rebase_path(output_filter, root_build_dir),
         "--destination_dir",
-        rebase_path(syzygy_dest_dir, root_build_dir),
+        rebase_path(dest_dir, root_build_dir),
       ]
 
       deps = [
         "//chrome/tools/build/win/syzygy:copy_syzyasan_binaries",
       ]
       if (defined(invoker.deps)) {

[brettw, 2016/06/24 23:51:43]

Ditto for these three.

[Dirk Pranke, 2016/06/25 22:53:58]

Acknowledged.

         deps += invoker.deps
       }
       if (defined(invoker.public_deps)) {
         public_deps = invoker.public_deps
       }
+      if (defined(invoker.data_deps)) {
+        data_deps = invoker.data_deps
+      }
     }
   }
 
   syzygy_asan("chrome_dll_syzygy") {
-    dll_name = "chrome"
+    binary_name = "chrome.dll"
+    dest_dir = syzygy_dest_dir
     deps = [
       "//chrome:main_dll",
     ]
   }
 
   if (is_multi_dll_chrome) {
     # Also instrument chrome_child.dll.
     #
     # For official builds, the instrumented version will be put into an
     # "instrumented" subdirectory and the regular output will be
     # uninstrumented. Otherwise, chrome_child is also instrumented to the
     # normal place.
     syzygy_asan("chrome_child_dll_syzygy") {
-      dll_name = "chrome_child"
+      binary_name = "chrome_child.dll"
       deps = [
         "//chrome:chrome_child",
       ]
 
       if (is_official_build) {
         dest_dir = "$syzygy_dest_dir/instrumented"
         deps += [ ":chrome_child_dll_syzygy_copy" ]
       } else {
         dest_dir = syzygy_dest_dir
       }
-    }
 
-    if (is_official_build) {
-      # Copies the uninstrumented chrome_child.dll.
-      # GYP version: chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy_copy
-      copy("chrome_child_dll_syzygy_copy") {
-        sources = [
-          "$root_out_dir/chrome_child.dll",
-          "$root_out_dir/chrome_child.dll.pdb",
-        ]
-        outputs = [
-          "$syzygy_dest_dir/{{source_file_part}}",
-        ]
-        deps = [
-          "//chrome:chrome_child",
-        ]
+      if (is_official_build) {
+        # Copies the uninstrumented chrome_child.dll.
+        # GYP version: chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy_copy
+        copy("chrome_child_dll_syzygy_copy") {

[brettw, 2016/06/24 23:51:43]

The copy target is defined inside the syzygy_asan target. They shouldn't be
bested (I'm surprised it works).

[Dirk Pranke, 2016/06/25 22:53:57]

s/bested/nested :).

Ack.

+          sources = [
+            "$root_out_dir/chrome_child.dll",
+            "$root_out_dir/chrome_child.dll.pdb",
+          ]
+          outputs = [
+            "$dest_dir/{{source_file_part}}",
+          ]
+          deps = [
+            "//chrome:chrome_child",
+          ]
+        }
       }
+      data_deps = [
+        ":chrome_child_dll_syzygy",
+      ]
     }
   }
 } else {
   # No syzygy. Generate dummy targets so other targets can unconditionally
   # depend on these without having to duplicate our conditions.
   group("chrome_dll_syzygy") {
   }
   if (is_multi_dll_chrome) {
     group("chrome_child_dll_syzygy") {
     }
@@ skipping 14 matching lines @@
     ]
 
     outputs = [
       "$syzygy_dest_dir/{{source_file_part}}",
     ]
   }
 }
 
 # Prevent unused variable warning for code paths where this is unused.
 assert(syzygy_dest_dir != "")