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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 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
« no previous file with comments | « chrome/chrome.gyp ('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) 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 # Dummy target to allow chrome to require chrome_dll to build 6 # Dummy target to allow chrome to require chrome_dll to build
7 # without actually linking to the library 7 # without actually linking to the library
8 ['OS=="mac"', { 8 ['OS=="mac"', {
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 'wsock32.dll', 241 'wsock32.dll',
242 ], 242 ],
243 }, 243 },
244 'VCManifestTool': { 244 'VCManifestTool': {
245 'AdditionalManifestFiles': [ 245 'AdditionalManifestFiles': [
246 '$(ProjectDir)\\app\\chrome.dll.manifest', 246 '$(ProjectDir)\\app\\chrome.dll.manifest',
247 ], 247 ],
248 }, 248 },
249 }, 249 },
250 'conditions': [ 250 'conditions': [
251 ['win_use_allocator_shim==1', {
252 'dependencies': [
253 '<(allocator_target)',
254 ],
255 }],
256 ['enable_basic_printing==1 or enable_print_preview==1', { 251 ['enable_basic_printing==1 or enable_print_preview==1', {
257 'dependencies': [ 252 'dependencies': [
258 '../printing/printing.gyp:printing', 253 '../printing/printing.gyp:printing',
259 ], 254 ],
260 }], 255 }],
261 ] 256 ]
262 }], 257 }],
263 ['chrome_multiple_dll==1', { 258 ['chrome_multiple_dll==1', {
264 'defines': [ 259 'defines': [
265 'CHROME_MULTIPLE_DLL_BROWSER', 260 'CHROME_MULTIPLE_DLL_BROWSER',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 'defines': [ 353 'defines': [
359 'CHROME_MULTIPLE_DLL_CHILD', 354 'CHROME_MULTIPLE_DLL_CHILD',
360 ], 355 ],
361 'sources': [ 356 'sources': [
362 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 357 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
363 'app/chrome_main.cc', 358 'app/chrome_main.cc',
364 'app/chrome_main_delegate.cc', 359 'app/chrome_main_delegate.cc',
365 'app/chrome_main_delegate.h', 360 'app/chrome_main_delegate.h',
366 ], 361 ],
367 'conditions': [ 362 'conditions': [
368 ['OS=="win" and win_use_allocator_shim==1', {
369 'dependencies': [
370 '<(allocator_target)',
371 ],
372 }],
373 ['OS=="win"', { 363 ['OS=="win"', {
374 'conditions': [ 364 'conditions': [
375 ['chrome_pgo_phase!=0', { 365 ['chrome_pgo_phase!=0', {
376 # Disable Warning 4702 ("Unreachable code") for the WPO/PGO 366 # Disable Warning 4702 ("Unreachable code") for the WPO/PGO
377 # builds. Probably anything that this would catch that 367 # builds. Probably anything that this would catch that
378 # wouldn't be caught in a normal build isn't going to 368 # wouldn't be caught in a normal build isn't going to
379 # actually be a bug, so the incremental value of C4702 for 369 # actually be a bug, so the incremental value of C4702 for
380 # PGO builds is likely very small. 370 # PGO builds is likely very small.
381 'msvs_disabled_warnings': [ 371 'msvs_disabled_warnings': [
382 4702 372 4702
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 'dependencies': [ 411 'dependencies': [
422 '../pdf/pdf.gyp:pdf', 412 '../pdf/pdf.gyp:pdf',
423 ], 413 ],
424 }], 414 }],
425 ], 415 ],
426 }, # target chrome_child_dll 416 }, # target chrome_child_dll
427 ], 417 ],
428 }], 418 }],
429 ], 419 ],
430 } 420 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698