| OLD | NEW |
| 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 'variables': { | 6 'variables': { |
| 7 'jemalloc_dir': '../../third_party/jemalloc/chromium', | 7 'jemalloc_dir': '../../third_party/jemalloc/chromium', |
| 8 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', | 8 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', |
| 9 }, | 9 }, |
| 10 'targets': [ | 10 'targets': [ |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 # Do not compile and link the heapchecker source. | 425 # Do not compile and link the heapchecker source. |
| 426 'sources!': [ | 426 'sources!': [ |
| 427 '<(tcmalloc_dir)/src/heap-checker-bcad.cc', | 427 '<(tcmalloc_dir)/src/heap-checker-bcad.cc', |
| 428 '<(tcmalloc_dir)/src/heap-checker.cc', | 428 '<(tcmalloc_dir)/src/heap-checker.cc', |
| 429 ], | 429 ], |
| 430 # Disable the heap checker in tcmalloc. | 430 # Disable the heap checker in tcmalloc. |
| 431 'defines': [ | 431 'defines': [ |
| 432 'NO_HEAP_CHECK', | 432 'NO_HEAP_CHECK', |
| 433 ], | 433 ], |
| 434 }], | 434 }], |
| 435 [ 'clang==1', { |
| 436 'cflags': [ |
| 437 '-Wno-non-literal-null-conversion', |
| 438 ], |
| 439 }], |
| 435 ], | 440 ], |
| 436 }, | 441 }, |
| 437 { | 442 { |
| 438 # This library is linked in to src/base.gypi:base and allocator_unittests | 443 # This library is linked in to src/base.gypi:base and allocator_unittests |
| 439 # It can't depend on either and nothing else should depend on it - all | 444 # It can't depend on either and nothing else should depend on it - all |
| 440 # other code should use the interfaced provided by base. | 445 # other code should use the interfaced provided by base. |
| 441 'target_name': 'allocator_extension_thunks', | 446 'target_name': 'allocator_extension_thunks', |
| 442 'type': 'static_library', | 447 'type': 'static_library', |
| 443 'sources': [ | 448 'sources': [ |
| 444 'allocator_extension_thunks.cc', | 449 'allocator_extension_thunks.cc', |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 'dependencies': [ | 530 'dependencies': [ |
| 526 '../../testing/gtest.gyp:gtest', | 531 '../../testing/gtest.gyp:gtest', |
| 527 '../base.gyp:base', | 532 '../base.gyp:base', |
| 528 'allocator', | 533 'allocator', |
| 529 ], | 534 ], |
| 530 }, | 535 }, |
| 531 ], | 536 ], |
| 532 }], | 537 }], |
| 533 ], | 538 ], |
| 534 } | 539 } |
| OLD | NEW |