syzygy steps for chrome_child.dll

Adds optional build steps to do syzygy steps on chrome_child.dll. gyp
refactor to make the chrome_syzygy.gyp be reusable twice.

mini_installer_syzygy fiddled a little to use a list of binaries.

TBR=chrisha@chromium.org, robertshield@chromium.org
BUG=237249

Review URL: https://chromiumcodereview.appspot.com/21093004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214802 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 68 deletions

diff --git a/chrome/chrome_syzygy.gyp b/chrome/chrome_syzygy.gyp
index 09d4f57..d4994ac 100644
--- a/chrome/chrome_syzygy.gyp
+++ b/chrome/chrome_syzygy.gyp
@@ -3,80 +3,33 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="win" and fastbuild==0 and chrome_multiple_dll==0', {
-      # Reorder or instrument the initial chrome DLL executable, placing the
-      # optimized output and corresponding PDB file into the "syzygy"
-      # subdirectory.
-      # This target won't build in fastbuild, since there are no PDBs.
+    ['OS=="win" and fastbuild==0', {
+      'variables': {
+        'dll_name': 'chrome',
+      },
       'targets': [
         {
           'target_name': 'chrome_dll_syzygy',
           'type': 'none',
           'sources' : [],
-          'dependencies': [
-            '<(DEPTH)/chrome/chrome.gyp:chrome_dll',
+          'includes': [
+            'chrome_syzygy.gypi',
           ],
-          'variables': {
-            'dest_dir': '<(PRODUCT_DIR)/syzygy',
-          },
-          'conditions': [
-            ['asan!=1', {
-              # Reorder chrome DLL executable.
-              # If there's a matching chrome.dll-ordering.json file present in
-              # the output directory, chrome.dll will be ordered according to
-              # that, otherwise it will be randomized.
-              'actions': [
-                {
-                  'action_name': 'Reorder Chrome with Syzygy',
-                  'msvs_cygwin_shell': 0,
-                  'inputs': [
-                    '<(PRODUCT_DIR)/chrome.dll',
-                    '<(PRODUCT_DIR)/chrome.dll.pdb',
-                  ],
-                  'outputs': [
-                    '<(dest_dir)/chrome.dll',
-                    '<(dest_dir)/chrome.dll.pdb',
-                  ],
-                  'action': [
-                    'python',
-                    '<(DEPTH)/chrome/tools/build/win/syzygy_reorder.py',
-                    '--input_executable', '<(PRODUCT_DIR)/chrome.dll',
-                    '--input_symbol', '<(PRODUCT_DIR)/chrome.dll.pdb',
-                    '--destination_dir', '<(dest_dir)',
-                  ],
-                },
-              ],
-            }, {
-              # Instrument chrome DLL executable with SyzyAsan.
-              'actions': [
-                {
-                  'action_name': 'Instrument Chrome with SyzyAsan',
-                  'msvs_cygwin_shell': 0,
-                  'inputs': [
-                    '<(PRODUCT_DIR)/chrome.dll',
-                    '<(PRODUCT_DIR)/chrome.dll.pdb',
-                    '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt',
-                  ],
-                  'outputs': [
-                    '<(dest_dir)/chrome.dll',
-                    '<(dest_dir)/chrome.dll.pdb',
-                    '<(dest_dir)/asan_rtl.dll',
-                    '<(dest_dir)/asan_rtl.dll.pdb',
-                    '<(dest_dir)/win-syzyasan-filter.txt.json',
-                  ],
-                  'action': [
-                    'python',
-                    '<(DEPTH)/chrome/tools/build/win/syzygy_instrument.py',
-                    '--mode', 'asan',
-                    '--input_executable', '<(PRODUCT_DIR)/chrome.dll',
-                    '--input_symbol', '<(PRODUCT_DIR)/chrome.dll.pdb',
-                    '--filter',
-                    '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt',
-                    '--destination_dir', '<(dest_dir)',
-                  ],
-                },
-              ],
-            }],
+        },
+      ],
+    }],
+    # Note, not else.
+    ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1', {
+      'variables': {
+        'dll_name': 'chrome_child',
+      },
+      'targets': [
+        {
+          'target_name': 'chrome_child_dll_syzygy',
+          'type': 'none',
+          'sources' : [],
+          'includes': [
+            'chrome_syzygy.gypi',
           ],
         },
       ],