| Index: base/allocator/BUILD.gn
|
| diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
|
| index 8d963175dd9cf7b3792a218aeced48b7219f7a3a..e931b1ccfc17a9ba393bc1d4ed074bb6429f6e25 100644
|
| --- a/base/allocator/BUILD.gn
|
| +++ b/base/allocator/BUILD.gn
|
| @@ -46,6 +46,11 @@ if (use_allocator == "tcmalloc") {
|
| source_set("tcmalloc") {
|
| tcmalloc_dir = "//third_party/tcmalloc/chromium"
|
|
|
| + # Don't check tcmalloc's includes. These files include various files like
|
| + # base/foo.h and they actually refer to tcmalloc's forked copy of base
|
| + # rather than the regular one, which confuses the header checker.
|
| + check_includes = false
|
| +
|
| sources = [
|
| # Generated for our configuration from tcmalloc"s build
|
| # and checked in.
|
| @@ -134,7 +139,6 @@ if (use_allocator == "tcmalloc") {
|
| "$tcmalloc_dir/src/windows/port.cc",
|
| "$tcmalloc_dir/src/windows/port.h",
|
| "allocator_shim.cc",
|
| - "allocator_shim.h",
|
| "debugallocation_shim.cc",
|
|
|
| # These are both #included by allocator_shim for maximal linking.
|
| @@ -176,10 +180,10 @@ if (use_allocator == "tcmalloc") {
|
| # cpuprofiler
|
| "$tcmalloc_dir/src/base/thread_lister.c",
|
| "$tcmalloc_dir/src/base/thread_lister.h",
|
| - "$tcmalloc_dir/src/profiledata.cc",
|
| - "$tcmalloc_dir/src/profiledata.h",
|
| "$tcmalloc_dir/src/profile-handler.cc",
|
| "$tcmalloc_dir/src/profile-handler.h",
|
| + "$tcmalloc_dir/src/profiledata.cc",
|
| + "$tcmalloc_dir/src/profiledata.h",
|
| "$tcmalloc_dir/src/profiler.cc",
|
| ]
|
| defines += [ "PERFTOOLS_DLL_DECL=" ]
|
|
|