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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 284493002: Fix policy_component shared_library link without configuration_policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put policy_pref_names.cc in two separate sources list Created 6 years, 7 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 | « chrome/chrome_dll.gypi ('k') | chrome/chrome_process_finder.gypi » ('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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'none', 9 'type': 'none',
10 'dependencies': [ 'chrome_initial', ], 10 'dependencies': [ 'chrome_initial', ],
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 'chrome_nacl_win64', 494 'chrome_nacl_win64',
495 'chrome_process_finder', 495 'chrome_process_finder',
496 'chrome_version_resources', 496 'chrome_version_resources',
497 'installer_util', 497 'installer_util',
498 'image_pre_reader', 498 'image_pre_reader',
499 '../base/base.gyp:base', 499 '../base/base.gyp:base',
500 '../breakpad/breakpad.gyp:breakpad_handler', 500 '../breakpad/breakpad.gyp:breakpad_handler',
501 '../breakpad/breakpad.gyp:breakpad_sender', 501 '../breakpad/breakpad.gyp:breakpad_sender',
502 '../chrome_elf/chrome_elf.gyp:chrome_elf', 502 '../chrome_elf/chrome_elf.gyp:chrome_elf',
503 '../components/components.gyp:breakpad_component', 503 '../components/components.gyp:breakpad_component',
504 '../components/components.gyp:policy',
505 '../sandbox/sandbox.gyp:sandbox', 504 '../sandbox/sandbox.gyp:sandbox',
506 ], 505 ],
507 'sources': [ 506 'sources': [
508 'app/chrome_breakpad_client.cc', 507 'app/chrome_breakpad_client.cc',
509 'app/chrome_breakpad_client.h', 508 'app/chrome_breakpad_client.h',
510 'app/chrome_exe.rc', 509 'app/chrome_exe.rc',
511 'common/crash_keys.cc', 510 'common/crash_keys.cc',
512 'common/crash_keys.h', 511 'common/crash_keys.h',
513 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 512 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
514 ], 513 ],
(...skipping 12 matching lines...) Expand all
527 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. 526 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
528 'SubSystem': '2', 527 'SubSystem': '2',
529 }, 528 },
530 'VCManifestTool': { 529 'VCManifestTool': {
531 'AdditionalManifestFiles': [ 530 'AdditionalManifestFiles': [
532 '$(ProjectDir)\\app\\chrome.exe.manifest', 531 '$(ProjectDir)\\app\\chrome.exe.manifest',
533 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_ assembly.manifest', 532 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_ assembly.manifest',
534 ], 533 ],
535 }, 534 },
536 }, 535 },
536 'conditions': [
537 ['configuration_policy==1', {
538 'dependencies': [
539 '<(DEPTH)/components/components.gyp:policy',
540 ],
541 }],
542 ],
537 'actions': [ 543 'actions': [
538 { 544 {
539 'action_name': 'first_run', 545 'action_name': 'first_run',
540 'inputs': [ 546 'inputs': [
541 'app/FirstRun', 547 'app/FirstRun',
542 ], 548 ],
543 'outputs': [ 549 'outputs': [
544 '<(PRODUCT_DIR)/First Run', 550 '<(PRODUCT_DIR)/First Run',
545 ], 551 ],
546 'action': ['python', '../build/cp.py', '<@(_inputs)', '<@(_outputs )'], 552 'action': ['python', '../build/cp.py', '<@(_inputs)', '<@(_outputs )'],
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 'chrome_version_resources', 627 'chrome_version_resources',
622 'installer_util_nacl_win64', 628 'installer_util_nacl_win64',
623 '../base/base.gyp:base_i18n_nacl_win64', 629 '../base/base.gyp:base_i18n_nacl_win64',
624 '../base/base.gyp:base_win64', 630 '../base/base.gyp:base_win64',
625 '../base/base.gyp:base_static_win64', 631 '../base/base.gyp:base_static_win64',
626 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp :dynamic_annotations_win64', 632 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp :dynamic_annotations_win64',
627 '../breakpad/breakpad.gyp:breakpad_handler_win64', 633 '../breakpad/breakpad.gyp:breakpad_handler_win64',
628 '../breakpad/breakpad.gyp:breakpad_sender_win64', 634 '../breakpad/breakpad.gyp:breakpad_sender_win64',
629 '../components/components.gyp:breakpad_win64', 635 '../components/components.gyp:breakpad_win64',
630 '../chrome/common_constants.gyp:common_constants_win64', 636 '../chrome/common_constants.gyp:common_constants_win64',
631 '../components/components.gyp:policy_win64',
632 '../components/nacl.gyp:nacl_win64', 637 '../components/nacl.gyp:nacl_win64',
633 '../crypto/crypto.gyp:crypto_nacl_win64', 638 '../crypto/crypto.gyp:crypto_nacl_win64',
634 '../ipc/ipc.gyp:ipc_win64', 639 '../ipc/ipc.gyp:ipc_win64',
635 '../sandbox/sandbox.gyp:sandbox_win64', 640 '../sandbox/sandbox.gyp:sandbox_win64',
636 ], 641 ],
637 'defines': [ 642 'defines': [
638 '<@(nacl_win64_defines)', 643 '<@(nacl_win64_defines)',
639 'COMPILE_CONTENT_STATICALLY', 644 'COMPILE_CONTENT_STATICALLY',
640 ], 645 ],
641 'include_dirs': [ 646 'include_dirs': [
642 '<(SHARED_INTERMEDIATE_DIR)/chrome', 647 '<(SHARED_INTERMEDIATE_DIR)/chrome',
643 ], 648 ],
644 'msvs_settings': { 649 'msvs_settings': {
645 'VCLinkerTool': { 650 'VCLinkerTool': {
646 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 651 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
647 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 652 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
648 }, 653 },
649 }, 654 },
650 'configurations': { 655 'configurations': {
651 'Common_Base': { 656 'Common_Base': {
652 'msvs_target_platform': 'x64', 657 'msvs_target_platform': 'x64',
653 }, 658 },
654 }, 659 },
660 'conditions': [
661 ['configuration_policy==1', {
662 'dependencies': [
663 '<(DEPTH)/components/components.gyp:policy_win64',
664 ],
665 }],
666 ],
655 }, 667 },
656 ], 668 ],
657 }, { # else (disable_nacl==1) 669 }, { # else (disable_nacl==1)
658 'targets': [ 670 'targets': [
659 { 671 {
660 'target_name': 'chrome_nacl_win64', 672 'target_name': 'chrome_nacl_win64',
661 'type': 'none', 673 'type': 'none',
662 'sources': [], 674 'sources': [],
663 }, 675 },
664 ], 676 ],
(...skipping 20 matching lines...) Expand all
685 'dependencies': [ 697 'dependencies': [
686 'chrome_nacl_win64', 698 'chrome_nacl_win64',
687 ], 699 ],
688 }], 700 }],
689 ], 701 ],
690 }, 702 },
691 ], 703 ],
692 }], 704 }],
693 ], 705 ],
694 } 706 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_process_finder.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698