Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: content/content_shell.gypi

Issue 394853002: Make content_shell.exe a console app in ASan/Win builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix whitespace Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/app/shell_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index b15570bf9ecfa07c5f35d5d1c5b3fbdac1f4e938..281b1fada05eb3e754de4a85bb1249fcf83fbf2e 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -519,9 +519,6 @@
'INFOPLIST_FILE': 'shell/app/app-Info.plist',
},
'msvs_settings': {
- 'VCLinkerTool': {
- 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
- },
'VCManifestTool': {
'AdditionalManifestFiles': [
'shell/app/shell.exe.manifest',
@@ -553,6 +550,13 @@
'../sandbox/sandbox.gyp:sandbox',
],
}], # OS=="win"
+ ['OS=="win" and asan==0', {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
+ },
+ },
+ }], # OS=="win" and asan==0
['OS=="mac"', {
'product_name': '<(content_shell_product_name)',
'dependencies!': [
« no previous file with comments | « no previous file | content/shell/app/shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698