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

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

Issue 1487403002: Remove allocator_extension_thunks since this layer is not required (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove NULL Created 5 years 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
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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 }], 346 }],
347 ['order_profiling != 0', { 347 ['order_profiling != 0', {
348 'target_conditions' : [ 348 'target_conditions' : [
349 ['_toolset=="target"', { 349 ['_toolset=="target"', {
350 'cflags!': [ '-finstrument-functions' ], 350 'cflags!': [ '-finstrument-functions' ],
351 }], 351 }],
352 ], 352 ],
353 }], 353 }],
354 ], 354 ],
355 }, 355 },
356 {
357 # This library is linked in to src/base.gypi:base and allocator_unittests
358 # It can't depend on either and nothing else should depend on it - all
359 # other code should use the interfaced provided by base.
360 'target_name': 'allocator_extension_thunks',
361 'type': 'static_library',
362 'sources': [
363 'allocator_extension_thunks.cc',
364 'allocator_extension_thunks.h',
365 ],
366 'toolsets': ['host', 'target'],
367 'include_dirs': [
368 '../../'
369 ],
370 },
371 ], 356 ],
372 'conditions': [ 357 'conditions': [
373 ['OS=="win" and component!="shared_library"', { 358 ['OS=="win" and component!="shared_library"', {
374 'targets': [ 359 'targets': [
375 { 360 {
376 'target_name': 'libcmt', 361 'target_name': 'libcmt',
377 'type': 'none', 362 'type': 'none',
378 'actions': [ 363 'actions': [
379 { 364 {
380 'action_name': 'libcmt', 365 'action_name': 'libcmt',
(...skipping 11 matching lines...) Expand all
392 '<(target_arch)', 377 '<(target_arch)',
393 ], 378 ],
394 }, 379 },
395 ], 380 ],
396 }, 381 },
397 { 382 {
398 'target_name': 'allocator_unittests', 383 'target_name': 'allocator_unittests',
399 'type': 'executable', 384 'type': 'executable',
400 'dependencies': [ 385 'dependencies': [
401 'allocator', 386 'allocator',
402 'allocator_extension_thunks',
403 '../../testing/gtest.gyp:gtest', 387 '../../testing/gtest.gyp:gtest',
404 ], 388 ],
405 'include_dirs': [ 389 'include_dirs': [
406 '.', 390 '.',
407 '../..', 391 '../..',
408 ], 392 ],
409 'sources': [ 393 'sources': [
410 '../profiler/alternate_timer.cc', 394 '../profiler/alternate_timer.cc',
411 '../profiler/alternate_timer.h', 395 '../profiler/alternate_timer.h',
412 'allocator_unittest.cc', 396 'allocator_unittest.cc',
413 ], 397 ],
414 }, 398 },
415 ], 399 ],
416 }], 400 }],
417 ['OS=="win" and target_arch=="ia32"', {
418 'targets': [
419 {
420 'target_name': 'allocator_extension_thunks_win64',
421 'type': 'static_library',
422 'sources': [
423 'allocator_extension_thunks.cc',
424 'allocator_extension_thunks.h',
425 ],
426 'toolsets': ['host', 'target'],
427 'include_dirs': [
428 '../../'
429 ],
430 'configurations': {
431 'Common_Base': {
432 'msvs_target_platform': 'x64',
433 },
434 },
435 },
436 ],
437 }],
438 ['use_allocator=="tcmalloc"', { 401 ['use_allocator=="tcmalloc"', {
439 'targets': [ 402 'targets': [
440 { 403 {
441 'target_name': 'tcmalloc_unittest', 404 'target_name': 'tcmalloc_unittest',
442 'type': 'executable', 405 'type': 'executable',
443 'sources': [ 406 'sources': [
444 'tcmalloc_unittest.cc', 407 'tcmalloc_unittest.cc',
445 ], 408 ],
446 'include_dirs': [ 409 'include_dirs': [
447 '<(tcmalloc_dir)/src', 410 '<(tcmalloc_dir)/src',
448 '../..', 411 '../..',
449 ], 412 ],
450 'dependencies': [ 413 'dependencies': [
451 '../../testing/gtest.gyp:gtest', 414 '../../testing/gtest.gyp:gtest',
452 'allocator', 415 'allocator',
453 ], 416 ],
454 }, 417 },
455 ], 418 ],
456 }], 419 }],
457 ], 420 ],
458 } 421 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698