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

Unified Diff: base/allocator/BUILD.gn

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/BUILD.gn ('k') | base/android/content_uri_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/BUILD.gn
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
index d9ff4c51acefc83fc4b913f3daf12a19896c88f1..09d4f850d472ec05bca5affdf7641e767ba081f5 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -10,7 +10,9 @@ import("//build/config/allocator.gni")
# to the build settings.
group("allocator") {
if (use_allocator == "tcmalloc") {
- deps = [ ":tcmalloc" ]
+ deps = [
+ ":tcmalloc",
+ ]
}
}
@@ -54,6 +56,7 @@ if (use_allocator == "tcmalloc") {
"$tcmalloc_dir/src/base/abort.cc",
"$tcmalloc_dir/src/base/abort.h",
"$tcmalloc_dir/src/base/arm_instruction_set_select.h",
+
# We don't list dynamic_annotations.c since its copy is already
# present in the dynamic_annotations target.
"$tcmalloc_dir/src/base/elf_mem_image.cc",
@@ -79,6 +82,7 @@ if (use_allocator == "tcmalloc") {
"$tcmalloc_dir/src/central_freelist.h",
"$tcmalloc_dir/src/common.cc",
"$tcmalloc_dir/src/common.h",
+
# #included by debugallocation_shim.cc
#"$tcmalloc_dir/src/debugallocation.cc",
"$tcmalloc_dir/src/deep-heap-profile.cc",
@@ -120,13 +124,13 @@ if (use_allocator == "tcmalloc") {
"$tcmalloc_dir/src/symbolize.h",
"$tcmalloc_dir/src/system-alloc.cc",
"$tcmalloc_dir/src/system-alloc.h",
+
# #included by debugallocation_shim.cc
#"$tcmalloc_dir/src/tcmalloc.cc",
"$tcmalloc_dir/src/thread_cache.cc",
"$tcmalloc_dir/src/thread_cache.h",
"$tcmalloc_dir/src/windows/port.cc",
"$tcmalloc_dir/src/windows/port.h",
-
"allocator_shim.cc",
"allocator_shim.h",
"debugallocation_shim.cc",
@@ -186,9 +190,7 @@ if (use_allocator == "tcmalloc") {
public_configs = [ ":nocmt" ]
- deps += [
- ":prep_libc",
- ]
+ deps += [ ":prep_libc" ]
}
if (is_linux || is_android) {
@@ -215,6 +217,7 @@ if (use_allocator == "tcmalloc") {
# Don't let linker rip this symbol out, otherwise the heap&cpu
# profilers will not initialize properly on startup.
"-Wl,-uIsHeapProfilerRunning,-uProfilerStart",
+
# Do the same for heap leak checker.
"-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi",
"-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl",
@@ -229,9 +232,7 @@ if (use_allocator == "tcmalloc") {
configs += [ "//build/config/compiler:optimize_max" ]
}
- deps += [
- "//base/third_party/dynamic_annotations",
- ]
+ deps += [ "//base/third_party/dynamic_annotations" ]
if (is_win) {
ldflags = [ "/ignore:4006:4221" ]
« no previous file with comments | « base/BUILD.gn ('k') | base/android/content_uri_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698