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

Unified Diff: base/allocator/allocator.gyp

Issue 1331973002: Remove clang type profiler and deep memory profiler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/BUILD.gn ('k') | base/allocator/type_profiler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator.gyp
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 7cd9b64d8c51241e0c8a5bc8d30a7d29bc91a745..ae93e9e03ca902fb8a10e66e1c2230f47a7d8ae7 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -153,8 +153,6 @@
'<(tcmalloc_dir)/src/common.cc',
'<(tcmalloc_dir)/src/common.h',
'<(tcmalloc_dir)/src/debugallocation.cc',
- '<(tcmalloc_dir)/src/deep-heap-profile.cc',
- '<(tcmalloc_dir)/src/deep-heap-profile.h',
'<(tcmalloc_dir)/src/free_list.cc',
'<(tcmalloc_dir)/src/free_list.h',
'<(tcmalloc_dir)/src/getpc.h',
@@ -296,19 +294,6 @@
'../..',
],
}],
- ['OS=="linux" and clang_type_profiler==1', {
- 'dependencies': [
- 'type_profiler_tcmalloc',
- ],
- # It is undoing dependencies and cflags_cc for type_profiler which
- # build/common.gypi injects into all targets.
- 'dependencies!': [
- 'type_profiler',
- ],
- 'cflags_cc!': [
- '-fintercept-allocation-functions',
- ],
- }],
['OS=="win" and component!="shared_library"', {
'dependencies': [
'libcmt',
@@ -382,18 +367,6 @@
'include_dirs': [
'../../'
],
- 'conditions': [
- ['OS=="linux" and clang_type_profiler==1', {
- # It is undoing dependencies and cflags_cc for type_profiler which
- # build/common.gypi injects into all targets.
- 'dependencies!': [
- 'type_profiler',
- ],
- 'cflags_cc!': [
- '-fintercept-allocation-functions',
- ],
- }],
- ],
},
],
'conditions': [
@@ -462,93 +435,6 @@
},
],
}],
- ['OS=="linux" and clang_type_profiler==1', {
- # Some targets in this section undo dependencies and cflags_cc for
- # type_profiler which build/common.gypi injects into all targets.
- 'targets': [
- {
- 'target_name': 'type_profiler',
- 'type': 'static_library',
- 'dependencies!': [
- 'type_profiler',
- ],
- 'cflags_cc!': [
- '-fintercept-allocation-functions',
- ],
- 'include_dirs': [
- '../..',
- ],
- 'sources': [
- 'type_profiler.cc',
- 'type_profiler.h',
- 'type_profiler_control.h',
- ],
- 'toolsets': ['host', 'target'],
- },
- {
- 'target_name': 'type_profiler_tcmalloc',
- 'type': 'static_library',
- 'dependencies!': [
- 'type_profiler',
- ],
- 'cflags_cc!': [
- '-fintercept-allocation-functions',
- ],
- 'include_dirs': [
- '<(tcmalloc_dir)/src',
- '../..',
- ],
- 'sources': [
- '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h',
- '<(tcmalloc_dir)/src/type_profiler_map.cc',
- 'type_profiler_tcmalloc.cc',
- 'type_profiler_tcmalloc.h',
- ],
- },
- {
- 'target_name': 'type_profiler_unittests',
- 'type': 'executable',
- 'dependencies': [
- '../../testing/gtest.gyp:gtest',
- '../base.gyp:base',
- 'allocator',
- 'type_profiler_tcmalloc',
- ],
- 'include_dirs': [
- '../..',
- ],
- 'sources': [
- 'type_profiler_control.cc',
- 'type_profiler_control.h',
- 'type_profiler_unittest.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',
- '../..',
- ],
- 'sources': [
- '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h',
- '<(tcmalloc_dir)/src/type_profiler_map.cc',
- 'type_profiler_map_unittest.cc',
- ],
- },
- ],
- }],
['use_allocator=="tcmalloc"', {
'targets': [
{
« no previous file with comments | « base/allocator/BUILD.gn ('k') | base/allocator/type_profiler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698