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

Hardlink from different dir for chrome.exe caused annoyance when running from
Visual Studio because $(TargetPath) the default in the .user file is not the
correct path. So, instead do the hardlink on the dll. To avoid the possible
expense on non-NTFS, and to enable a trybot in the future, do this hardlink
based on a gyp define.

BUG=92528, 92685
TEST=No link problems


Review URL: http://codereview.chromium.org/7670031

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

1 files changed, 15 insertions, 2 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index cab8bd2..5c7c964 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -147,6 +147,7 @@
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
+                  'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                   'conditions': [
                     ['optimize_with_syzygy==1', {
                       # When syzygy is enabled we use build chrome_dll as an
@@ -154,12 +155,24 @@
                       # optimizes it to its final location
                       'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
                       'OutputFile': '$(OutDir)\\initial\\chrome.dll',
-                    }, {
-                      'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
+                    }], ['incremental_chrome_dll==1', {
+                      'OutputFile': '$(OutDir)\\initial\\chrome.dll',
+                      'UseLibraryDependencyInputs': "true",
                     }],
                   ],
                 },
               },
+              'conditions': [
+                ['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
+                  # Linking to a different directory and then hardlinking back
+                  # to OutDir is a workaround to avoid having the .ilk for
+                  # chrome.exe 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)\\initial\\chrome.dll $(OutDir)\\chrome.dll'
+                }]
+              ]
             }],  # OS=="win"
             ['OS=="mac"', {
               # The main browser executable's name is <(mac_product_name).