Chromium Code Reviews| Index: base/allocator/allocator.gyp |
| =================================================================== |
| --- base/allocator/allocator.gyp (revision 137587) |
| +++ base/allocator/allocator.gyp (working copy) |
| @@ -201,7 +201,7 @@ |
| 'allocator_shim.cc', |
| 'allocator_shim.h', |
| 'generic_allocators.cc', |
| - 'win_allocator.cc', |
| + 'win_allocator.cc', |
| ], |
| # sources! means that these are not compiled directly. |
| 'sources!': [ |
| @@ -428,8 +428,8 @@ |
| ], |
| }, |
| { |
| - # This library is linked in to libbase and allocator_unittests. |
| - # It can't depend on either and nothing else should depend on it - |
| + # This library is linked in to libbase, allocator_unittests and TCMalloc |
|
rvargas (doing something else)
2012/05/19 01:08:04
nit: libbase -> base
kaiwang
2012/05/21 18:11:42
Done.
|
| + # tests. It can't depend on either and nothing else should depend on it - |
|
rvargas (doing something else)
2012/05/19 01:08:04
If you want to refer to this as tcmalloc tests, th
kaiwang
2012/05/21 18:11:42
Done, modified comment and renamed to tcmalloc_uni
|
| # all other code should use the interfaced provided by libbase. |
| 'target_name': 'allocator_extension_thunks', |
| 'type': 'static_library', |
| @@ -503,6 +503,35 @@ |
| }, |
| }, |
| }, |
| + { |
| + 'target_name': 'tcmalloc_free_check_test', |
| + 'type': 'executable', |
| + 'sources': [ |
| + 'tcmalloc_free_check_test.cc', |
| + |
| + # Part of chromium code(instead of TCMalloc). We don't include the |
| + # TCMalloc version(atomicops-internals-x86.cc) in allocator library, |
| + # so need this for replacement. |
| + '../atomicops_internals_x86_gcc.cc', |
| + |
| + # Code allocator_shim.cc depends on. |
| + '../profiler/alternate_timer.cc', |
| + '../profiler/alternate_timer.h', |
| + ], |
| + 'include_dirs': [ |
| + # This is tricky.. We add this include dir so alternate_timer.cc will |
| + # use TCMalloc's logging.h, instead of the chromium base/logging.h as |
|
rvargas (doing something else)
2012/05/19 01:08:04
say that we don't want to depend on base. (why not
kaiwang
2012/05/21 18:11:42
Maybe I'm wrong. base is defined in base.gypi, I t
rvargas (doing something else)
2012/05/21 18:44:30
I'm not sure what you mean by "include it into thi
kaiwang
2012/05/21 22:21:42
You are right. This makes this target a lot more s
|
| + # in other build targets. |
| + '<(tcmalloc_dir)/src', |
| + |
|
rvargas (doing something else)
2012/05/19 01:08:04
remove line
kaiwang
2012/05/21 18:11:42
The above comment is only targeting one line of th
rvargas (doing something else)
2012/05/21 18:44:30
That's a good point, I missed that. But then, it i
kaiwang
2012/05/21 22:21:42
Putting tcmalloc/src before ../.. is because tcmal
|
| + '../..', |
| + ], |
| + 'dependencies': [ |
| + 'allocator', |
| + 'allocator_extension_thunks', |
| + '../../testing/gtest.gyp:gtest', |
| + ], |
| + }, |
| ], |
| }], |
| ], |