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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 7670031: restore OutputFile for chrome.exe, do moving hardlink on dll instead (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: use initial instead of incremental to coexist with syzygy flag Created 9 years, 4 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 | « build/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': { 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 140 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
141 141
142 # TODO(sgk): left-over from pre-gyp build, figure out 142 # TODO(sgk): left-over from pre-gyp build, figure out
143 # if we still need them and/or how to update to gyp. 143 # if we still need them and/or how to update to gyp.
144 #'app/check_dependents.bat', 144 #'app/check_dependents.bat',
145 #'app/chrome.dll.deps', 145 #'app/chrome.dll.deps',
146 ], 146 ],
147 'msvs_settings': { 147 'msvs_settings': {
148 'VCLinkerTool': { 148 'VCLinkerTool': {
149 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', 149 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
150 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
150 'conditions': [ 151 'conditions': [
151 ['optimize_with_syzygy==1', { 152 ['optimize_with_syzygy==1', {
152 # When syzygy is enabled we use build chrome_dll as an 153 # When syzygy is enabled we use build chrome_dll as an
153 # intermediate target then have a subsequent step which 154 # intermediate target then have a subsequent step which
154 # optimizes it to its final location 155 # optimizes it to its final location
155 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb ', 156 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb ',
156 'OutputFile': '$(OutDir)\\initial\\chrome.dll', 157 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
157 }, { 158 }], ['incremental_chrome_dll==1', {
158 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', 159 'OutputFile': '$(OutDir)\\initial\\chrome.dll',
160 'UseLibraryDependencyInputs': "true",
159 }], 161 }],
160 ], 162 ],
161 }, 163 },
162 }, 164 },
165 'conditions': [
166 ['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
167 # Linking to a different directory and then hardlinking back
168 # to OutDir is a workaround to avoid having the .ilk for
169 # chrome.exe and chrome.dll conflicting. See crbug.com/92528
170 # for more information. Done on the dll instead of the exe so
171 # that people launching from VS don't need to modify
172 # $(TargetPath) for the exe.
173 'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $( OutDir)\\initial\\chrome.dll $(OutDir)\\chrome.dll'
174 }]
175 ]
163 }], # OS=="win" 176 }], # OS=="win"
164 ['OS=="mac"', { 177 ['OS=="mac"', {
165 # The main browser executable's name is <(mac_product_name). 178 # The main browser executable's name is <(mac_product_name).
166 # Certain things will get confused if two modules in the 179 # Certain things will get confused if two modules in the
167 # executable share the same name, so append " Framework" to the 180 # executable share the same name, so append " Framework" to the
168 # product_name used for the framework. This will result in 181 # product_name used for the framework. This will result in
169 # a name like "Chromium Framework.framework". 182 # a name like "Chromium Framework.framework".
170 'product_name': '<(mac_product_name) Framework', 183 'product_name': '<(mac_product_name) Framework',
171 'mac_bundle': 1, 184 'mac_bundle': 1,
172 'xcode_settings': { 185 'xcode_settings': {
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 747 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
735 }, 748 },
736 }, 749 },
737 }, 750 },
738 }, 751 },
739 }, # target chrome_dll 752 }, # target chrome_dll
740 ], 753 ],
741 }], 754 }],
742 ], 755 ],
743 } 756 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698