restore OutputFile for chrome.exe, do moving hardlink on dll instead

chrome/chrome_dll.gypi

Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 18d8fa0968e0de0d950f1f4ff9bbaf8b6005bbcf..04a39fbcc4c0427dd08b7ab283b47e319ec00d01 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -154,12 +154,24 @@
                       # optimizes it to its final location
                       'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
                       'OutputFile': '$(OutDir)\\initial\\chrome.dll',
+                    }], ['incremental_chrome_dll==1', {

[Roger McFarlane (Chromium), 2011/08/17 19:12:35]

If I understand what you intend, the flow of these conditions isn't doing what
you want it to.  The conditions here are equivalent to:

  if optimize_with_syzygy then
     set pdb and output files

  if incremental_chrome_dll then
     set output file and use library dependency
  else
     set pdb file


Per the docs (http://code.google.com/p/gyp/wiki/InputFormatReference#Merging)
you should be able to move the pdb setting out of the condition (just after the
ImportLibrary settings, above) and get the "correct" behavior.

+                      'OutputFile': '$(OutDir)\\incremental\\chrome.dll',
+                      'UseLibraryDependencyInputs': "true",
                     }, {
                       'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                     }],
                   ],
                 },
               },
+              'conditions': [['incremental_chrome_dll==1', {

[Roger McFarlane (Chromium), 2011/08/17 19:12:35]

Perhaps 'incremental_chrome_dll==1 && optimize_with_syzygy==0'?

In principle, these two setting could co-exist (modulo some issues Syzygy has
groking incrementally linked binaries and PDB files).

Btw, does this work for Release builds, and for Official builds (Release plus
other optimizations)? Does the flag need to understand what configuration is
been used?

Also, formatting convention seems put the conditional on the next line.  I.e.,

  'conditions': [
    ['foo="bar"', {
      ...
    }],
  ],

+                # Linking to a different directory and then hardlinking back to
+                # OutDiris a workaround to avoid having the .ilk for chrome.exe

[Roger McFarlane (Chromium), 2011/08/17 19:12:35]

OutDiris -> Outdir is

+                # and chrome.dll conflicting. See crbug.com/92528 for more
+                # information. Done on the dll instead of the exe so that
+                # people launching from VS don't need to modify $(TargetPath)
+                # for the exe.
+                'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(OutDir)\\incremental\\chrome.dll $(OutDir)\\chrome.dll'
+              }]]
             }],  # OS=="win"
             ['OS=="mac"', {
               # The main browser executable's name is <(mac_product_name).