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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/shell/app/shell_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 # TODO(mark): Come up with a fancier way to do this. It should only 512 # TODO(mark): Come up with a fancier way to do this. It should only
513 # be necessary to list app-Info.plist once, not the three times it is 513 # be necessary to list app-Info.plist once, not the three times it is
514 # listed here. 514 # listed here.
515 'mac_bundle_resources!': [ 515 'mac_bundle_resources!': [
516 'shell/app/app-Info.plist', 516 'shell/app/app-Info.plist',
517 ], 517 ],
518 'xcode_settings': { 518 'xcode_settings': {
519 'INFOPLIST_FILE': 'shell/app/app-Info.plist', 519 'INFOPLIST_FILE': 'shell/app/app-Info.plist',
520 }, 520 },
521 'msvs_settings': { 521 'msvs_settings': {
522 'VCLinkerTool': {
523 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
524 },
525 'VCManifestTool': { 522 'VCManifestTool': {
526 'AdditionalManifestFiles': [ 523 'AdditionalManifestFiles': [
527 'shell/app/shell.exe.manifest', 524 'shell/app/shell.exe.manifest',
528 ], 525 ],
529 }, 526 },
530 }, 527 },
531 'conditions': [ 528 'conditions': [
532 ['OS=="win" and win_use_allocator_shim==1', { 529 ['OS=="win" and win_use_allocator_shim==1', {
533 'dependencies': [ 530 'dependencies': [
534 '../base/allocator/allocator.gyp:allocator', 531 '../base/allocator/allocator.gyp:allocator',
(...skipping 11 matching lines...) Expand all
546 }, 543 },
547 }, 544 },
548 }, 545 },
549 }, 546 },
550 }], # OS=="win" 547 }], # OS=="win"
551 ['OS == "win"', { 548 ['OS == "win"', {
552 'dependencies': [ 549 'dependencies': [
553 '../sandbox/sandbox.gyp:sandbox', 550 '../sandbox/sandbox.gyp:sandbox',
554 ], 551 ],
555 }], # OS=="win" 552 }], # OS=="win"
553 ['OS=="win" and asan==0', {
554 'msvs_settings': {
555 'VCLinkerTool': {
556 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
557 },
558 },
559 }], # OS=="win" and asan==0
556 ['OS=="mac"', { 560 ['OS=="mac"', {
557 'product_name': '<(content_shell_product_name)', 561 'product_name': '<(content_shell_product_name)',
558 'dependencies!': [ 562 'dependencies!': [
559 'content_shell_lib', 563 'content_shell_lib',
560 ], 564 ],
561 'dependencies': [ 565 'dependencies': [
562 'content_shell_framework', 566 'content_shell_framework',
563 'content_shell_helper_app', 567 'content_shell_helper_app',
564 ], 568 ],
565 'copies': [ 569 'copies': [
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1101 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1098 '--destination_dir', '<(dest_dir)', 1102 '--destination_dir', '<(dest_dir)',
1099 ], 1103 ],
1100 }, 1104 },
1101 ], 1105 ],
1102 }, 1106 },
1103 ], 1107 ],
1104 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1108 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1105 ] 1109 ]
1106 } 1110 }
OLDNEW
« 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