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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 10698129: Send the user's Windows profile type up in crash reports. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome_nacl_win64. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/breakpad_win.cc ('k') | no next file » | 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 '../breakpad/breakpad.gyp:breakpad_sender', 457 '../breakpad/breakpad.gyp:breakpad_sender',
458 '../sandbox/sandbox.gyp:sandbox', 458 '../sandbox/sandbox.gyp:sandbox',
459 'app/policy/cloud_policy_codegen.gyp:policy', 459 'app/policy/cloud_policy_codegen.gyp:policy',
460 ], 460 ],
461 'sources': [ 461 'sources': [
462 'app/chrome_exe.rc', 462 'app/chrome_exe.rc',
463 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 463 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
464 ], 464 ],
465 'msvs_settings': { 465 'msvs_settings': {
466 'VCLinkerTool': { 466 'VCLinkerTool': {
467 'AdditionalDependencies': [
468 'userenv.lib',
469 ],
467 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 470 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
468 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 471 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
469 'DelayLoadDLLs': [ 472 'DelayLoadDLLs': [
470 'dbghelp.dll', 473 'dbghelp.dll',
471 'dwmapi.dll', 474 'dwmapi.dll',
472 'uxtheme.dll', 475 'uxtheme.dll',
473 'ole32.dll', 476 'ole32.dll',
474 'oleaut32.dll', 477 'oleaut32.dll',
475 ], 478 ],
476 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. 479 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 ], 558 ],
556 'defines': [ 559 'defines': [
557 '<@(nacl_win64_defines)', 560 '<@(nacl_win64_defines)',
558 'COMPILE_CONTENT_STATICALLY', 561 'COMPILE_CONTENT_STATICALLY',
559 ], 562 ],
560 'include_dirs': [ 563 'include_dirs': [
561 '<(SHARED_INTERMEDIATE_DIR)/chrome', 564 '<(SHARED_INTERMEDIATE_DIR)/chrome',
562 ], 565 ],
563 'msvs_settings': { 566 'msvs_settings': {
564 'VCLinkerTool': { 567 'VCLinkerTool': {
568 'AdditionalDependencies': [
569 'userenv.lib',
570 ],
565 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 571 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
566 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', 572 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
567 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 573 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
568 }, 574 },
569 }, 575 },
570 'configurations': { 576 'configurations': {
571 'Common_Base': { 577 'Common_Base': {
572 'msvs_target_platform': 'x64', 578 'msvs_target_platform': 'x64',
573 }, 579 },
574 }, 580 },
575 }, 581 },
576 ], 582 ],
577 }, { # else (disable_nacl==1) 583 }, { # else (disable_nacl==1)
578 'targets': [ 584 'targets': [
579 { 585 {
580 'target_name': 'chrome_nacl_win64', 586 'target_name': 'chrome_nacl_win64',
581 'type': 'none', 587 'type': 'none',
582 'sources': [], 588 'sources': [],
583 }, 589 },
584 ], 590 ],
585 }], 591 }],
586 ], 592 ],
587 }], 593 }],
588 ], 594 ],
589 } 595 }
OLDNEW
« no previous file with comments | « chrome/app/breakpad_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698