Revert overly-wide change in dependency chain. Now the new build step will only be enabled when ...

chrome/chrome_exe.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'chrome_exe_target': 0,
     },
     'target_conditions': [
@@ skipping 410 matching lines @@
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             # On Mac, make sure we've built chrome_dll, which contains all of
             # the library code with Chromium functionality.
             'chrome_dll',
           ],
         }],
         ['OS=="win"', {
+          'conditions': [
+            ['optimize_with_syzygy==1', {
+              # With syzygy enabled there is an intermediate target which
+              # builds an initial version of chrome_dll, then optimizes it
+              # to its final location.  The optimization step also
+              # depends on chrome_exe, so here we depend on the initial
+              # chrome_dll.
+              'dependencies': ['chrome_dll_initial',]
+            }, {
+              'dependencies': ['chrome_dll',]
+            }],
+          ],
+        }],
+        ['OS=="win"', {
           'dependencies': [
-            # On Windows there is an intermediate target which builds an
-            # initial version of chrome_dll, then either optimizes it or
-            # copies to its final location.  The optimization step also
-            # depends on chrome_exe, so here we depend on the initial
-            # chrome_dll.
-            'chrome_dll_initial',
             'chrome_version_resources',
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
             '../sandbox/sandbox.gyp:sandbox',
             'app/locales/locales.gyp:*',
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
@@ skipping 54 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }