base/allocator/allocator.gyp - Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/allocator/allocator.gyp

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 6 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

Index: base/allocator/allocator.gyp

===================================================================

--- base/allocator/allocator.gyp (revision 88335)

+++ base/allocator/allocator.gyp (working copy)

@@ -49,8 +49,12 @@

# all tcmalloc native and forked files

'<(tcmalloc_dir)/src/addressmap-inl.h',

'<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',

+ '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h',

+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h',

+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h',

+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h',

'<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',

- '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',

+ '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h',

'<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',

'<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',

'<(tcmalloc_dir)/src/base/atomicops.h',

@@ -72,10 +76,13 @@

'<(tcmalloc_dir)/src/base/simple_mutex.h',

'<(tcmalloc_dir)/src/base/spinlock.cc',

'<(tcmalloc_dir)/src/base/spinlock.h',

+ '<(tcmalloc_dir)/src/base/spinlock_internal.cc',

+ '<(tcmalloc_dir)/src/base/spinlock_internal.h',

'<(tcmalloc_dir)/src/base/spinlock_linux-inl.h',

'<(tcmalloc_dir)/src/base/spinlock_posix-inl.h',

'<(tcmalloc_dir)/src/base/spinlock_win32-inl.h',

'<(tcmalloc_dir)/src/base/stl_allocator.h',

+ '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h',

'<(tcmalloc_dir)/src/base/sysinfo.cc',

'<(tcmalloc_dir)/src/base/sysinfo.h',

'<(tcmalloc_dir)/src/base/thread_annotations.h',

@@ -394,7 +401,6 @@

'msvs_guid': 'E99DA267-BE90-4F45-1294-6919DB2C9999',

'sources': [

- 'unittest_utils.cc',

'allocator_unittests.cc',

« no previous file with comments | « no previous file | base/allocator/allocator_shim.cc » ('j') | no next file with comments »