diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 10 | ||||
| -rw-r--r-- | base/allocator/allocator_shim.cc | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index cfa7f92d..5b6ebea 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -48,8 +48,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', @@ -71,10 +75,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', @@ -392,7 +399,6 @@ '../..', ], 'sources': [ - 'unittest_utils.cc', 'allocator_unittests.cc', ], }, diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index caf6d7e..b7973e8 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -5,6 +5,7 @@ #include "base/allocator/allocator_shim.h" #include <config.h> +#include "base/sysinfo.h" // When defined, different heap allocators can be used via an environment // variable set before running the program. This may reduce the amount |