Index: chrome/chrome_exe.gypi |
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi |
index 30dccfde589eb031364cc64f2eed08e046c6bbf3..a9e9c675bf46ece28d748e6e4bc540431e50d729 100644 |
--- a/chrome/chrome_exe.gypi |
+++ b/chrome/chrome_exe.gypi |
@@ -518,9 +518,7 @@ |
], |
'AdditionalDependencies': [ 'wintrust.lib' ], |
'conditions': [ |
- ['asan==0', { |
- # Set /SUBSYSTEM:WINDOWS for chrome.exe itself, except for the |
- # AddressSanitizer build where console output is important. |
+ ['win_force_console==0', { |
'SubSystem': '2', |
}], |
], |
@@ -648,7 +646,11 @@ |
'msvs_settings': { |
'VCLinkerTool': { |
'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
- 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
+ 'conditions': [ |
+ ['win_force_console==0', { |
+ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
+ }], |
+ ], |
}, |
}, |
'configurations': { |