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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 22329002: fix allocator shim for multiple_dll debug build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win only Created 7 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 | « 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',
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 'ws2_32.dll', 219 'ws2_32.dll',
220 'wsock32.dll', 220 'wsock32.dll',
221 ], 221 ],
222 }, 222 },
223 'VCManifestTool': { 223 'VCManifestTool': {
224 'AdditionalManifestFiles': [ 224 'AdditionalManifestFiles': [
225 '$(ProjectDir)\\app\\chrome.dll.manifest', 225 '$(ProjectDir)\\app\\chrome.dll.manifest',
226 ], 226 ],
227 }, 227 },
228 }, 228 },
229 'conditions': [
230 ['win_use_allocator_shim==1', {
231 'dependencies': [
232 '<(allocator_target)',
233 ],
234 }],
235 ]
229 }], 236 }],
230 ['chrome_multiple_dll==1', { 237 ['chrome_multiple_dll==1', {
231 'defines': [ 238 'defines': [
232 'CHROME_MULTIPLE_DLL_BROWSER', 239 'CHROME_MULTIPLE_DLL_BROWSER',
233 ], 240 ],
234 }, { 241 }, {
235 'dependencies': [ 242 'dependencies': [
236 '<@(chromium_child_dependencies)', 243 '<@(chromium_child_dependencies)',
237 '../content/content.gyp:content_app_child', 244 '../content/content.gyp:content_app_child',
238 '../content/content.gyp:content_worker', 245 '../content/content.gyp:content_worker',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 368 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
362 'app/chrome_main.cc', 369 'app/chrome_main.cc',
363 'app/chrome_main_delegate.cc', 370 'app/chrome_main_delegate.cc',
364 'app/chrome_main_delegate.h', 371 'app/chrome_main_delegate.h',
365 ], 372 ],
366 }, # target chrome_child_dll 373 }, # target chrome_child_dll
367 ], 374 ],
368 }], 375 }],
369 ], 376 ],
370 } 377 }
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