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

Side by Side Diff: base/allocator/allocator.gyp

Issue 1414453017: Allocator shims working on VS2015. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « base/allocator/BUILD.gn ('k') | base/allocator/allocator_check.cc » ('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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 # This code gets run a lot and debugged rarely, so it should be fast 8 # This code gets run a lot and debugged rarely, so it should be fast
9 # by default. See http://crbug.com/388949. 9 # by default. See http://crbug.com/388949.
10 'debug_optimize': '2', 10 'debug_optimize': '2',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 ['OS=="win" and win_use_allocator_shim==1', { 42 ['OS=="win" and win_use_allocator_shim==1', {
43 'msvs_settings': { 43 'msvs_settings': {
44 # TODO(sgk): merge this with build/common.gypi settings 44 # TODO(sgk): merge this with build/common.gypi settings
45 'VCLibrarianTool': { 45 'VCLibrarianTool': {
46 'AdditionalOptions': ['/ignore:4006,4221'], 46 'AdditionalOptions': ['/ignore:4006,4221'],
47 }, 47 },
48 'VCLinkerTool': { 48 'VCLinkerTool': {
49 'AdditionalOptions': ['/ignore:4006'], 49 'AdditionalOptions': ['/ignore:4006'],
50 }, 50 },
51 }, 51 },
52 'dependencies': [
53 'libcmt',
54 ],
55 'include_dirs': [ 52 'include_dirs': [
56 '../..', 53 '../..',
57 ], 54 ],
58 'sources': [ 55 'sources': [
59 'allocator_shim_win.cc', 56 'allocator_shim_win.cc',
57 'allocator_shim_win.h',
60 ], 58 ],
61 'link_settings': {
62 'msvs_settings': {
63 'VCLinkerTool': {
64 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
65 'AdditionalDependencies': [
66 '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
67 ],
68 },
69 },
70 },
71 'configurations': { 59 'configurations': {
72 'Debug_Base': { 60 'Debug_Base': {
73 'msvs_settings': { 61 'msvs_settings': {
74 'VCCLCompilerTool': { 62 'VCCLCompilerTool': {
75 'RuntimeLibrary': '0', 63 'RuntimeLibrary': '0',
76 }, 64 },
77 }, 65 },
78 }, 66 },
79 }, 67 },
80 }], # OS=="win" 68 }], # OS=="win"
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 'includes': [ '../../build/buildflag_header.gypi' ], 374 'includes': [ '../../build/buildflag_header.gypi' ],
387 'variables': { 375 'variables': {
388 'buildflag_header_path': 'base/allocator/features.h', 376 'buildflag_header_path': 'base/allocator/features.h',
389 'buildflag_flags': [ 377 'buildflag_flags': [
390 'USE_EXPERIMENTAL_ALLOCATOR_SHIM=<(use_experimental_allocator_shim)', 378 'USE_EXPERIMENTAL_ALLOCATOR_SHIM=<(use_experimental_allocator_shim)',
391 ], 379 ],
392 }, 380 },
393 }, # 'allocator_features' target. 381 }, # 'allocator_features' target.
394 ], # targets. 382 ], # targets.
395 'conditions': [ 383 'conditions': [
396 ['OS=="win" and win_use_allocator_shim==1', {
397 'targets': [
398 {
399 'target_name': 'libcmt',
400 'toolsets': ['host', 'target'],
401 'type': 'none',
402 'actions': [
403 {
404 'action_name': 'libcmt',
405 'inputs': [
406 'prep_libc.py',
407 ],
408 'outputs': [
409 '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib',
410 ],
411 'action': [
412 'python',
413 'prep_libc.py',
414 '$(VCInstallDir)lib',
415 '<(SHARED_INTERMEDIATE_DIR)/allocator',
416 '<(target_arch)',
417 ],
418 },
419 ],
420 },
421 ],
422 }],
423 ['use_experimental_allocator_shim==1', { 384 ['use_experimental_allocator_shim==1', {
424 'targets': [ 385 'targets': [
425 { 386 {
426 # GN: //base/allocator:unified_allocator_shim 387 # GN: //base/allocator:unified_allocator_shim
427 'target_name': 'unified_allocator_shim', 388 'target_name': 'unified_allocator_shim',
428 'toolsets': ['host', 'target'], 389 'toolsets': ['host', 'target'],
429 'type': 'static_library', 390 'type': 'static_library',
430 'defines': [ 'BASE_IMPLEMENTATION' ], 391 'defines': [ 'BASE_IMPLEMENTATION' ],
431 'sources': [ 392 'sources': [
432 'allocator_shim.cc', 393 'allocator_shim.cc',
(...skipping 16 matching lines...) Expand all
449 'sources': [ 410 'sources': [
450 'allocator_shim_default_dispatch_to_glibc.cc', 411 'allocator_shim_default_dispatch_to_glibc.cc',
451 ], 412 ],
452 }], 413 }],
453 ] 414 ]
454 }, # 'unified_allocator_shim' target. 415 }, # 'unified_allocator_shim' target.
455 ], 416 ],
456 }] 417 }]
457 ], 418 ],
458 } 419 }
OLDNEW
« no previous file with comments | « base/allocator/BUILD.gn ('k') | base/allocator/allocator_check.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698