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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 11420019: mac: In component builds, put all chrome code in a nonbundle dylib. 25% faster incremental builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month 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 | « no previous file | 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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
11 'dependencies': [ 11 'dependencies': [
12 'chrome_main_dll', 12 'chrome_main_dll',
13 ], 13 ],
14 'conditions': [ 14 'conditions': [
15 ['OS=="mac" and component=="shared_library"', {
16 'type': 'shared_library',
17 'includes': [ 'chrome_dll_bundle.gypi' ],
18 'xcode_settings': {
19 'OTHER_LDFLAGS': [
20 '-Wl,-reexport_library,<(PRODUCT_DIR)/libchrome_main_dll.dylib ',
21 ],
22 },
23 }], # OS=="mac"
15 ['incremental_chrome_dll==1', { 24 ['incremental_chrome_dll==1', {
16 # Linking to a different directory and then hardlinking back 25 # Linking to a different directory and then hardlinking back
17 # to OutDir is a workaround to avoid having the .ilk for 26 # to OutDir is a workaround to avoid having the .ilk for
18 # chrome.exe and chrome.dll conflicting. See crbug.com/92528 27 # chrome.exe and chrome.dll conflicting. See crbug.com/92528
19 # for more information. Done on the dll instead of the exe so 28 # for more information. Done on the dll instead of the exe so
20 # that people launching from VS don't need to modify 29 # that people launching from VS don't need to modify
21 # $(TargetPath) for the exe. 30 # $(TargetPath) for the exe.
22 'actions': [ 31 'actions': [
23 { 32 {
24 'action_name': 'hardlink_to_output', 33 'action_name': 'hardlink_to_output',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 'winspool.drv', 171 'winspool.drv',
163 'ws2_32.dll', 172 'ws2_32.dll',
164 'wsock32.dll', 173 'wsock32.dll',
165 ], 174 ],
166 }, 175 },
167 'VCManifestTool': { 176 'VCManifestTool': {
168 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man ifest', 177 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.man ifest',
169 }, 178 },
170 }, 179 },
171 }], # OS=="win" 180 }], # OS=="win"
181 ['OS=="mac" and component!="shared_library"', {
182 'includes': [ 'chrome_dll_bundle.gypi' ],
183 }],
184 ['OS=="mac" and component=="shared_library"', {
185 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
186 }],
172 ['OS=="mac"', { 187 ['OS=="mac"', {
173 'includes': [ 'chrome_dll_bundle.gypi' ],
174 'xcode_settings': { 188 'xcode_settings': {
175 # Define the order of symbols within the framework. This 189 # Define the order of symbols within the framework. This
176 # sets -order_file. 190 # sets -order_file.
177 'ORDER_FILE': 'app/framework.order', 191 'ORDER_FILE': 'app/framework.order',
178 }, 192 },
179 'sources': [ 193 'sources': [
180 'app/chrome_command_ids.h', 194 'app/chrome_command_ids.h',
181 'app/chrome_dll_resource.h', 195 'app/chrome_dll_resource.h',
182 'app/chrome_main.cc', 196 'app/chrome_main.cc',
183 'app/chrome_main_delegate.cc', 197 'app/chrome_main_delegate.cc',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 ], 242 ],
229 }], 243 }],
230 ], # conditions 244 ], # conditions
231 }], # OS=="mac" 245 }], # OS=="mac"
232 ], # conditions 246 ], # conditions
233 }, # target chrome_dll 247 }, # target chrome_dll
234 ], # targets 248 ], # targets
235 }], # OS=="mac" or OS=="win" 249 }], # OS=="mac" or OS=="win"
236 ], 250 ],
237 } 251 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698