| 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!': [
|
|
|