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

chrome/chrome_dll.gypi

Index: chrome/chrome_dll.gypi
===================================================================
--- chrome/chrome_dll.gypi	(revision 95783)
+++ chrome/chrome_dll.gypi	(working copy)
@@ -66,7 +66,7 @@
           'variables': {
             'chrome_dll_target': 1,
             'conditions' : [
-              ['OS=="win"', {
+              ['OS=="win" and optimize_with_syzygy==1', {
                 # On Windows we use build chrome_dll as an intermediate target
                 # then have a subsequent step which either optimizes it to its
                 # final location, or copies it to its final location, depending
@@ -146,19 +146,15 @@
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
-                  # On Windows we use build chrome_dll as an intermediate target
-                  # then have a subsequent step which either optimizes it to its
-                  # final location, or copies it to its final location, based
-                  # on whether or not optimize_with_syzygy==1.
-                  'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
-                  'OutputFile': '$(OutDir)\\initial\\chrome.dll',
                   'conditions': [
-                    ['fastbuild==0', {

[Roger McFarlane (Google), 2011/08/08 20:08:13]

Unfortunately, you're seeing two nearby changes.  The removal of this
fastbuild==0 condition is a different change.  See:

http://codereview.chromium.org/7541080/

This change in in the commit queue.

-                      # This corresponds to the /PROFILE flag which ensures the PDB
-                      # file contains FIXUP information. This information is used
-                      # by the Syzygy optimization tool. Syzygy optimization is
-                      # disabled when fastbuild!=0.
-                      'Profile': 'true',
+                    ['optimize_with_syzygy==1', {
+                      # When syzygy is enabled we use build chrome_dll as an
+                      # intermediate target then have a subsequent step which
+                      # optimizes it to its final location
+                      'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
+                      'OutputFile': '$(OutDir)\\initial\\chrome.dll',
+                    }, {
+                      'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                     }],
                   ],
                 },