| Index: chrome/chrome_dll.gypi
|
| diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
|
| index eb8b8bd34812344dfec152ef032652791747e2d2..6ab5f75f85f7c3918496285986f13aa414ef8c69 100644
|
| --- a/chrome/chrome_dll.gypi
|
| +++ b/chrome/chrome_dll.gypi
|
| @@ -148,6 +148,8 @@
|
| 'VCLinkerTool': {
|
| 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
|
| 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
|
| + 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
|
| + 'UseLibraryDependencyInputs': "true",
|
| 'conditions': [
|
| ['optimize_with_syzygy==1', {
|
| # When syzygy is enabled we use build chrome_dll as an
|
| @@ -155,15 +157,12 @@
|
| # optimizes it to its final location
|
| 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
|
| 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
|
| - }], ['incremental_chrome_dll==1', {
|
| - 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
|
| - 'UseLibraryDependencyInputs': "true",
|
| - }],
|
| + }]
|
| ],
|
| },
|
| },
|
| 'conditions': [
|
| - ['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
|
| + ['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
|
|
|