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

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

Issue 432021: Branch new tcmalloc_linux.cc into new chromium\src branch. Update new... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/tcmalloc/chromium/src/tcmalloc_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/allocator/allocator.gyp:r69-2775
Merged /trunk/src/third_party/tcmalloc/tcmalloc.gyp:r33010
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 '<(tcmalloc_dir)/src/base/vdso_support.cc', 96 '<(tcmalloc_dir)/src/base/vdso_support.cc',
97 '<(tcmalloc_dir)/src/base/vdso_support.h', 97 '<(tcmalloc_dir)/src/base/vdso_support.h',
98 '<(tcmalloc_dir)/src/google/tcmalloc.h', 98 '<(tcmalloc_dir)/src/google/tcmalloc.h',
99 '<(tcmalloc_dir)/src/maybe_threads.cc', 99 '<(tcmalloc_dir)/src/maybe_threads.cc',
100 '<(tcmalloc_dir)/src/maybe_threads.h', 100 '<(tcmalloc_dir)/src/maybe_threads.h',
101 '<(tcmalloc_dir)/src/symbolize.cc', 101 '<(tcmalloc_dir)/src/symbolize.cc',
102 '<(tcmalloc_dir)/src/symbolize.h', 102 '<(tcmalloc_dir)/src/symbolize.h',
103 '<(tcmalloc_dir)/src/system-alloc.cc', 103 '<(tcmalloc_dir)/src/system-alloc.cc',
104 '<(tcmalloc_dir)/src/system-alloc.h', 104 '<(tcmalloc_dir)/src/system-alloc.h',
105 '<(tcmalloc_dir)/src/tcmalloc.cc', 105 '<(tcmalloc_dir)/src/tcmalloc.cc',
106 '<(tcmalloc_dir)/src/tcmalloc_linux.cc',
106 107
107 # heap-profiler/checker/cpuprofiler 108 # heap-profiler/checker/cpuprofiler
108 '<(tcmalloc_dir)/src/base/thread_lister.c', 109 '<(tcmalloc_dir)/src/base/thread_lister.c',
109 '<(tcmalloc_dir)/src/base/thread_lister.h', 110 '<(tcmalloc_dir)/src/base/thread_lister.h',
110 '<(tcmalloc_dir)/src/heap-checker-bcad.cc', 111 '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
111 '<(tcmalloc_dir)/src/heap-checker.cc', 112 '<(tcmalloc_dir)/src/heap-checker.cc',
112 '<(tcmalloc_dir)/src/heap-profiler.cc', 113 '<(tcmalloc_dir)/src/heap-profiler.cc',
113 '<(tcmalloc_dir)/src/memory_region_map.cc', 114 '<(tcmalloc_dir)/src/memory_region_map.cc',
114 '<(tcmalloc_dir)/src/memory_region_map.h', 115 '<(tcmalloc_dir)/src/memory_region_map.h',
115 '<(tcmalloc_dir)/src/profiledata.cc', 116 '<(tcmalloc_dir)/src/profiledata.cc',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 '<(tcmalloc_dir)/src/base/linuxthreads.h', 175 '<(tcmalloc_dir)/src/base/linuxthreads.h',
175 '<(tcmalloc_dir)/src/base/vdso_support.cc', 176 '<(tcmalloc_dir)/src/base/vdso_support.cc',
176 '<(tcmalloc_dir)/src/base/vdso_support.h', 177 '<(tcmalloc_dir)/src/base/vdso_support.h',
177 '<(tcmalloc_dir)/src/maybe_threads.cc', 178 '<(tcmalloc_dir)/src/maybe_threads.cc',
178 '<(tcmalloc_dir)/src/maybe_threads.h', 179 '<(tcmalloc_dir)/src/maybe_threads.h',
179 '<(tcmalloc_dir)/src/symbolize.cc', 180 '<(tcmalloc_dir)/src/symbolize.cc',
180 '<(tcmalloc_dir)/src/symbolize.h', 181 '<(tcmalloc_dir)/src/symbolize.h',
181 '<(tcmalloc_dir)/src/system-alloc.cc', 182 '<(tcmalloc_dir)/src/system-alloc.cc',
182 '<(tcmalloc_dir)/src/system-alloc.h', 183 '<(tcmalloc_dir)/src/system-alloc.h',
183 184
185 # don't use linux forked version
186 '<(tcmalloc_dir)/src/tcmalloc_linux.cc',
187
184 # heap-profiler/checker/cpuprofiler 188 # heap-profiler/checker/cpuprofiler
185 '<(tcmalloc_dir)/src/base/thread_lister.c', 189 '<(tcmalloc_dir)/src/base/thread_lister.c',
186 '<(tcmalloc_dir)/src/base/thread_lister.h', 190 '<(tcmalloc_dir)/src/base/thread_lister.h',
187 '<(tcmalloc_dir)/src/heap-checker-bcad.cc', 191 '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
188 '<(tcmalloc_dir)/src/heap-checker.cc', 192 '<(tcmalloc_dir)/src/heap-checker.cc',
189 '<(tcmalloc_dir)/src/heap-profiler.cc', 193 '<(tcmalloc_dir)/src/heap-profiler.cc',
190 '<(tcmalloc_dir)/src/memory_region_map.cc', 194 '<(tcmalloc_dir)/src/memory_region_map.cc',
191 '<(tcmalloc_dir)/src/memory_region_map.h', 195 '<(tcmalloc_dir)/src/memory_region_map.h',
192 '<(tcmalloc_dir)/src/profiledata.cc', 196 '<(tcmalloc_dir)/src/profiledata.cc',
193 '<(tcmalloc_dir)/src/profiledata.h', 197 '<(tcmalloc_dir)/src/profiledata.h',
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 ], 280 ],
277 }], 281 }],
278 ], 282 ],
279 } 283 }
280 284
281 # Local Variables: 285 # Local Variables:
282 # tab-width:2 286 # tab-width:2
283 # indent-tabs-mode:nil 287 # indent-tabs-mode:nil
284 # End: 288 # End:
285 # vim: set expandtab tabstop=2 shiftwidth=2: 289 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | third_party/tcmalloc/chromium/src/tcmalloc_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698