Chromium Code Reviews| Index: base/allocator/allocator.gyp |
| diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp |
| index 002ce2185a67e8ec6c600908075602565138511c..4a1b6af7ddcb3ea0cf29b3801787fffb7b53426d 100644 |
| --- a/base/allocator/allocator.gyp |
| +++ b/base/allocator/allocator.gyp |
| @@ -303,6 +303,17 @@ |
| }, |
| }, |
| 'conditions': [ |
| + ['OS=="linux" and clang_type_profiler==1', { |
| + 'dependencies': [ |
| + 'type_profiler_tcmalloc', |
| + ], |
| + 'dependencies!': [ |
| + 'type_profiler', |
| + ], |
| + 'cflags_cc!': [ |
| + '-fintercept-allocation-functions', |
| + ], |
| + }], |
| ['OS=="win"', { |
| 'defines': [ |
| 'PERFTOOLS_DLL_DECL=', |
| @@ -466,6 +477,16 @@ |
| 'include_dirs': [ |
| '../../' |
| ], |
| + 'conditions': [ |
| + ['OS=="linux" and clang_type_profiler==1', { |
| + 'dependencies!': [ |
| + 'type_profiler', |
| + ], |
| + 'cflags_cc!': [ |
| + '-fintercept-allocation-functions', |
| + ], |
| + }], |
| + ], |
| }, |
| ], |
| 'conditions': [ |
| @@ -548,5 +569,99 @@ |
| }, |
| ], |
| }], |
| + ['OS=="linux" and clang_type_profiler==1', { |
| + 'targets': [ |
|
Ryan Sleevi
2012/09/12 19:13:34
I think it would be helpful to have a comment abov
Dai Mikurube (NOT FULLTIME)
2012/09/13 04:00:12
Done.
|
| + { |
| + 'target_name': 'type_profiler', |
| + 'type': 'static_library', |
| + 'dependencies!': [ |
| + 'type_profiler', |
| + ], |
| + 'cflags_cc!': [ |
| + '-fintercept-allocation-functions', |
| + ], |
| + 'include_dirs': [ |
| + '.', |
| + '<(tcmalloc_dir)/src/base', |
| + '<(tcmalloc_dir)/src', |
| + '../..', |
|
Ryan Sleevi
2012/09/12 19:13:34
I don't believe any of the include_dirs are necess
Dai Mikurube (NOT FULLTIME)
2012/09/13 04:00:12
Good catch. Removed unnecessary dirs.
|
| + ], |
| + 'sources': [ |
| + 'type_profiler.cc', |
| + 'type_profiler.h', |
| + 'type_profiler_control.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'type_profiler_tcmalloc', |
| + 'type': 'static_library', |
| + 'dependencies!': [ |
| + 'type_profiler', |
| + ], |
| + 'cflags_cc!': [ |
| + '-fintercept-allocation-functions', |
| + ], |
| + 'include_dirs': [ |
| + '.', |
| + '<(tcmalloc_dir)/src/base', |
| + '<(tcmalloc_dir)/src', |
| + '../..', |
| + ], |
| + 'sources': [ |
| + 'type_profiler_tcmalloc.cc', |
| + 'type_profiler_tcmalloc.h', |
| + '<(tcmalloc_dir)/src/type_profiler_map.cc', |
| + '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'type_profiler_unittests', |
| + 'type': 'executable', |
| + 'dependencies': [ |
| + '../../testing/gtest.gyp:gtest', |
| + '../base.gyp:base', |
| + 'allocator', |
| + 'type_profiler_tcmalloc', |
| + ], |
| + 'include_dirs': [ |
| + '.', |
| + '<(tcmalloc_dir)/src/base', |
| + '<(tcmalloc_dir)/src', |
| + '../..', |
| + ], |
| + 'sources': [ |
| + 'type_profiler_control.cc', |
| + 'type_profiler_control.h', |
| + 'type_profiler_unittests.cc', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'type_profiler_map_unittests', |
| + 'type': 'executable', |
| + 'dependencies': [ |
| + '../../testing/gtest.gyp:gtest', |
| + '../base.gyp:base', |
| + 'allocator', |
| + ], |
| + 'dependencies!': [ |
| + 'type_profiler', |
| + ], |
| + 'cflags_cc!': [ |
| + '-fintercept-allocation-functions', |
| + ], |
| + 'include_dirs': [ |
| + '.', |
| + '<(tcmalloc_dir)/src/base', |
| + '<(tcmalloc_dir)/src', |
| + '../..', |
| + ], |
| + 'sources': [ |
| + 'type_profiler_map_unittests.cc', |
| + '<(tcmalloc_dir)/src/type_profiler_map.cc', |
| + '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h', |
| + ], |
| + }, |
| + ], |
| + }], |
| ], |
| } |