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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks Created 9 years, 3 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 5 'target_defaults': {
6 'variables': { 6 'variables': {
7 'chrome_dll_target': 0, 7 'chrome_dll_target': 0,
8 }, 8 },
9 'target_conditions': [ 9 'target_conditions': [
10 ['chrome_dll_target==1', { 10 ['chrome_dll_target==1', {
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 ], # conditions 652 ], # conditions
653 }, # target chrome_dll 653 }, # target chrome_dll
654 ], # targets 654 ], # targets
655 }], # OS=="mac" or OS=="win" 655 }], # OS=="mac" or OS=="win"
656 [ 'OS=="win"', { 656 [ 'OS=="win"', {
657 'targets': [ 657 'targets': [
658 { 658 {
659 'target_name': 'chrome_dll_nacl_win64', 659 'target_name': 'chrome_dll_nacl_win64',
660 'type': 'shared_library', 660 'type': 'shared_library',
661 'product_name': 'nacl64', 661 'product_name': 'nacl64',
662 'variables': {
663 'chrome_dll_target': 1,
664 },
665 'include_dirs': [ 662 'include_dirs': [
666 '..', 663 '..',
667 ], 664 ],
668 'dependencies': [ 665 'dependencies': [
669 '<@(nacl_win64_dependencies)',
670 'chrome_version_resources', 666 'chrome_version_resources',
667 'common_constants_win64',
668 'installer_util_nacl_win64',
671 'nacl_win64', 669 'nacl_win64',
672 '../base/base.gyp:base_i18n_nacl_win64', 670 '../base/base.gyp:base_i18n_nacl_win64',
671 '../base/base.gyp:base_static_win64',
672 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
673 '../ipc/ipc.gyp:ipc_win64',
673 ], 674 ],
674 'defines': [ 675 'defines': [
675 '<@(nacl_win64_defines)', 676 '<@(nacl_win64_defines)',
676 # Required to build gl_switches.cc as part of this binary.
677 'GL_IMPLEMENTATION'
678 ], 677 ],
679 'sources': [ 678 'sources': [
680 'app/chrome_command_ids.h', 679 'nacl/nacl_main_win_64.cc',
681 'app/chrome_dll_resource.h', 680 '../content/app/startup_helper_win.cc',
682 'app/chrome_main.cc',
683 # Parsing is needed for the UserDataDir policy which is read much
684 # earlier than the initialization of the policy/pref system.
685 'browser/policy/policy_path_parser_win.cc',
686 'browser/renderer_host/render_process_host_dummy.cc',
687 'common/googleurl_dummy.cc',
688
689 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_dll_version.rc',
690
691 # TODO: It would be nice to have these pulled in
692 # automatically from direct_dependent_settings in
693 # their various targets (net.gyp:net_resources, etc.),
694 # but that causes errors in other targets when
695 # resulting .res files get referenced multiple times.
696 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
697 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
698
699 # TODO(sgk): left-over from pre-gyp build, figure out
700 # if we still need them and/or how to update to gyp.
701 #'app/check_dependents.bat',
702 #'app/chrome.dll.deps',
703
704 # Stub entry points for process types that are not supported
705 # by NaCl Win64 executable
706 'app/dummy_main_functions.cc',
707
708 # TODO(bradnelson): once automatic generation of 64 bit targets on
709 # Windows is ready, take this out and add a dependency on
710 # content_common.gypi and common.gypi in nacl_win64_dependencies
711 # and get rid of the common_constants.gypi which was added as a hack
712 # to avoid making common compile on 64 bit on Windows.
713 '../chrome/common/chrome_content_client.cc',
714 '../chrome/common/chrome_content_plugin_client.cc',
715 '../content/app/content_main.cc',
716 '../content/common/child_process.cc',
717 '../content/common/child_thread.cc',
718 '../content/common/content_client.cc',
719 '../content/common/content_constants.cc',
720 '../content/common/content_counters.cc',
721 '../content/common/content_message_generator.cc',
722 '../content/common/content_paths.cc',
723 '../content/common/content_switches.cc', 681 '../content/common/content_switches.cc',
724 '../content/common/debug_flags.cc', 682 '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc
725 '../content/common/hi_res_timer_manager_win.cc', 683 '../content/common/hi_res_timer_manager_win.cc',
726 '../content/common/notification_details.cc',
727 '../content/common/notification_service.cc',
728 '../content/common/notification_source.cc',
729 '../content/common/sandbox_policy.cc', 684 '../content/common/sandbox_policy.cc',
730 '../content/common/sandbox_init_wrapper_win.cc', 685 '../content/common/sandbox_init_wrapper_win.cc',
731 '../content/common/url_constants.cc', 686 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_dll_version.rc',
732 '../ui/gfx/gl/gl_switches.cc',
733 ], 687 ],
734 'msvs_settings': { 688 'msvs_settings': {
735 'VCLinkerTool': { 689 'VCLinkerTool': {
736 'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib', 690 'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib',
737 'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb', 691 'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb',
692 'SubSystem': '2',
738 }, 693 },
739 }, 694 },
740 'configurations': { 695 'configurations': {
741 'Common_Base': { 696 'Common_Base': {
742 'msvs_target_platform': 'x64', 697 'msvs_target_platform': 'x64',
743 }, 698 },
744 'Debug_Base': { 699 'Debug_Base': {
745 'msvs_settings': { 700 'msvs_settings': {
746 'VCLinkerTool': { 701 'VCLinkerTool': {
747 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 702 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
748 }, 703 },
749 }, 704 },
750 }, 705 },
751 }, 706 },
752 }, # target chrome_dll 707 }, # target chrome_dll
753 ], 708 ],
754 }], 709 }],
755 ], 710 ],
756 } 711 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698