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

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: simplify chrome_exe.gypi 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
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.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) 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': {
6 'variables': {
7 'chrome_dll_target': 0,
8 },
9 'target_conditions': [
10 ['chrome_dll_target==1', {
11 'conditions': [
12 ['OS=="win"', {
13 'include_dirs': [
14 '<(DEPTH)/third_party/wtl/include',
15 ],
16 'defines': [
17 'CHROME_DLL',
18 'BROWSER_DLL',
19 'RENDERER_DLL',
20 'PLUGIN_DLL',
21 ],
22 'msvs_settings': {
23 'VCLinkerTool': {
24 'BaseAddress': '0x01c30000',
25 'DelayLoadDLLs': [
26 'comdlg32.dll',
27 'crypt32.dll',
28 'cryptui.dll',
29 'dhcpcsvc.dll',
30 'imagehlp.dll',
31 'imm32.dll',
32 'iphlpapi.dll',
33 'setupapi.dll',
34 'urlmon.dll',
35 'winhttp.dll',
36 'wininet.dll',
37 'winspool.drv',
38 'ws2_32.dll',
39 'wsock32.dll',
40 ],
41 # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
42 'SubSystem': '2',
43 },
44 'VCManifestTool': {
45 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manif est',
46 },
47 },
48 'configurations': {
49 'Debug_Base': {
50 'msvs_settings': {
51 'VCLinkerTool': {
52 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
53 },
54 },
55 },
56 },
57 }], # OS=="win"
58 ], # conditions
59 }],
60 ],
61 },
62 'conditions': [ 5 'conditions': [
63 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
64 'targets': [ 7 'targets': [
65 { 8 {
66 'variables': { 9 'variables': {
67 'chrome_dll_target': 1,
68 'conditions' : [ 10 'conditions' : [
69 ['OS=="win" and optimize_with_syzygy==1', { 11 ['OS=="win" and optimize_with_syzygy==1', {
70 # On Windows we use build chrome_dll as an intermediate target 12 # On Windows we use build chrome_dll as an intermediate target
71 # then have a subsequent step which either optimizes it to its 13 # then have a subsequent step which either optimizes it to its
72 # final location, or copies it to its final location, depending 14 # final location, or copies it to its final location, depending
73 # on whether or not optimize_with_syzygy==1. Please, refer to 15 # on whether or not optimize_with_syzygy==1. Please, refer to
74 # chrome_dll_syzygy.gypi for the subsequent defintion of the 16 # chrome_dll_syzygy.gypi for the subsequent defintion of the
75 # Windows chrome_dll target. 17 # Windows chrome_dll target.
76 'dll_target_name': 'chrome_dll_initial', 18 'dll_target_name': 'chrome_dll_initial',
77 }, { 19 }, {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 77 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
136 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource s_standard.rc', 78 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource s_standard.rc',
137 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 79 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
138 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 80 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
139 81
140 # TODO(sgk): left-over from pre-gyp build, figure out 82 # TODO(sgk): left-over from pre-gyp build, figure out
141 # if we still need them and/or how to update to gyp. 83 # if we still need them and/or how to update to gyp.
142 #'app/check_dependents.bat', 84 #'app/check_dependents.bat',
143 #'app/chrome.dll.deps', 85 #'app/chrome.dll.deps',
144 ], 86 ],
145 'msvs_settings': { 87 'include_dirs': [
88 '<(DEPTH)/third_party/wtl/include',
89 ],
90 'defines': [
91 'CHROME_DLL',
92 'BROWSER_DLL',
93 'RENDERER_DLL',
94 'PLUGIN_DLL',
95 ],
96 'configurations': {
97 'Debug_Base': {
98 'msvs_settings': {
99 'VCLinkerTool': {
100 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
101 },
102 },
103 },
104 },
105 'msvs_settings': {
146 'VCLinkerTool': { 106 'VCLinkerTool': {
107 'BaseAddress': '0x01c30000',
147 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', 108 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
148 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', 109 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
110 # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
111 'SubSystem': '2',
149 'conditions': [ 112 'conditions': [
150 ['optimize_with_syzygy==1', { 113 ['optimize_with_syzygy==1', {
151 # When syzygy is enabled we use build chrome_dll as an 114 # When syzygy is enabled we use build chrome_dll as an
152 # intermediate target then have a subsequent step which 115 # intermediate target then have a subsequent step which
153 # optimizes it to its final location 116 # optimizes it to its final location
154 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb ', 117 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb ',
155 'OutputFile': '$(OutDir)\\initial\\chrome.dll', 118 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
156 }], ['incremental_chrome_dll==1', { 119 }], ['incremental_chrome_dll==1', {
157 'OutputFile': '$(OutDir)\\initial\\chrome.dll', 120 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
158 'UseLibraryDependencyInputs': "true", 121 'UseLibraryDependencyInputs': "true",
159 }], 122 }],
160 ], 123 ],
124 'DelayLoadDLLs': [
125 'comdlg32.dll',
126 'crypt32.dll',
127 'cryptui.dll',
128 'dhcpcsvc.dll',
129 'imagehlp.dll',
130 'imm32.dll',
131 'iphlpapi.dll',
132 'setupapi.dll',
133 'urlmon.dll',
134 'winhttp.dll',
135 'wininet.dll',
136 'winspool.drv',
137 'ws2_32.dll',
138 'wsock32.dll',
139 ],
140 },
141 'VCManifestTool': {
142 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man ifest',
161 }, 143 },
162 }, 144 },
163 'conditions': [ 145 'conditions': [
164 ['incremental_chrome_dll==1 and optimize_with_syzygy==0', { 146 ['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
165 # Linking to a different directory and then hardlinking back 147 # Linking to a different directory and then hardlinking back
166 # to OutDir is a workaround to avoid having the .ilk for 148 # to OutDir is a workaround to avoid having the .ilk for
167 # chrome.exe and chrome.dll conflicting. See crbug.com/92528 149 # chrome.exe and chrome.dll conflicting. See crbug.com/92528
168 # for more information. Done on the dll instead of the exe so 150 # for more information. Done on the dll instead of the exe so
169 # that people launching from VS don't need to modify 151 # that people launching from VS don't need to modify
170 # $(TargetPath) for the exe. 152 # $(TargetPath) for the exe.
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 'dependencies': [ 629 'dependencies': [
648 '../pdf/pdf.gyp:pdf', 630 '../pdf/pdf.gyp:pdf',
649 ], 631 ],
650 }], 632 }],
651 ], # conditions 633 ], # conditions
652 }], # OS=="mac" 634 }], # OS=="mac"
653 ], # conditions 635 ], # conditions
654 }, # target chrome_dll 636 }, # target chrome_dll
655 ], # targets 637 ], # targets
656 }], # OS=="mac" or OS=="win" 638 }], # OS=="mac" or OS=="win"
657 [ 'OS=="win"', {
658 'targets': [
659 {
660 'target_name': 'chrome_dll_nacl_win64',
661 'type': 'shared_library',
662 'product_name': 'nacl64',
663 'variables': {
664 'chrome_dll_target': 1,
665 },
666 'include_dirs': [
667 '..',
668 ],
669 'dependencies': [
670 '<@(nacl_win64_dependencies)',
671 'chrome_version_resources',
672 'nacl_win64',
673 '../base/base.gyp:base_i18n_nacl_win64',
674 ],
675 'defines': [
676 '<@(nacl_win64_defines)',
677 # Required to build gl_switches.cc as part of this binary.
678 'GL_IMPLEMENTATION'
679 ],
680 'sources': [
681 'app/chrome_command_ids.h',
682 'app/chrome_dll_resource.h',
683 'app/chrome_main.cc',
684 # Parsing is needed for the UserDataDir policy which is read much
685 # earlier than the initialization of the policy/pref system.
686 'browser/policy/policy_path_parser_win.cc',
687 'browser/renderer_host/render_process_host_dummy.cc',
688 'common/googleurl_dummy.cc',
689
690 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_dll_version.rc',
691
692 # TODO: It would be nice to have these pulled in
693 # automatically from direct_dependent_settings in
694 # their various targets (net.gyp:net_resources, etc.),
695 # but that causes errors in other targets when
696 # resulting .res files get referenced multiple times.
697 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
698 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
699
700 # TODO(sgk): left-over from pre-gyp build, figure out
701 # if we still need them and/or how to update to gyp.
702 #'app/check_dependents.bat',
703 #'app/chrome.dll.deps',
704
705 # Stub entry points for process types that are not supported
706 # by NaCl Win64 executable
707 'app/dummy_main_functions.cc',
708
709 # TODO(bradnelson): once automatic generation of 64 bit targets on
710 # Windows is ready, take this out and add a dependency on
711 # content_common.gypi and common.gypi in nacl_win64_dependencies
712 # and get rid of the common_constants.gypi which was added as a hack
713 # to avoid making common compile on 64 bit on Windows.
714 '../chrome/common/chrome_content_client.cc',
715 '../chrome/common/chrome_content_plugin_client.cc',
716 '../content/app/content_main.cc',
717 '../content/common/child_process.cc',
718 '../content/common/child_thread.cc',
719 '../content/common/content_client.cc',
720 '../content/common/content_constants.cc',
721 '../content/common/content_counters.cc',
722 '../content/common/content_message_generator.cc',
723 '../content/common/content_paths.cc',
724 '../content/common/content_switches.cc',
725 '../content/common/debug_flags.cc',
726 '../content/common/hi_res_timer_manager_win.cc',
727 '../content/common/notification_details.cc',
728 '../content/common/notification_service.cc',
729 '../content/common/notification_source.cc',
730 '../content/common/sandbox_policy.cc',
731 '../content/common/sandbox_init_wrapper_win.cc',
732 '../content/common/url_constants.cc',
733 '../ui/gfx/gl/gl_switches.cc',
734 ],
735 'msvs_settings': {
736 'VCLinkerTool': {
737 'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib',
738 'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb',
739 },
740 },
741 'configurations': {
742 'Common_Base': {
743 'msvs_target_platform': 'x64',
744 },
745 'Debug_Base': {
746 'msvs_settings': {
747 'VCLinkerTool': {
748 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
749 },
750 },
751 },
752 },
753 }, # target chrome_dll
754 ],
755 }],
756 ], 639 ],
757 } 640 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698