diff options
| author | dpranke <dpranke@chromium.org> | 2015-12-11 16:38:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-12 00:39:35 +0000 |
| commit | cbe5b1fc629ab93631e1ba069c05936576ca93e9 (patch) | |
| tree | 056913c8d9752a611c5ae12a6bd87aff28bf121e /base/allocator | |
| parent | ad157151d2ed880ff783b6b68a7663b6aa49ba07 (diff) | |
| download | chromium_src-cbe5b1fc629ab93631e1ba069c05936576ca93e9.zip chromium_src-cbe5b1fc629ab93631e1ba069c05936576ca93e9.tar.gz chromium_src-cbe5b1fc629ab93631e1ba069c05936576ca93e9.tar.bz2 | |
Fix the `sizes` regressions in Linux GN.
The Linux GN build introduces a bunch of static initializers into
Chrome as a result of linking a number of components as source_sets
instead of static libraries. This CL flips the relevant components
back to static libraries accordingly until we can actually get rid of
the statics.
R=thakis@chromium.org, brettw@chromium.org
BUG=559766
Review URL: https://codereview.chromium.org/1466173002
Cr-Commit-Position: refs/heads/master@{#364845}
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/BUILD.gn | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn index 470f363..04409d3 100644 --- a/base/allocator/BUILD.gn +++ b/base/allocator/BUILD.gn @@ -99,7 +99,10 @@ if (is_win) { if (use_allocator == "tcmalloc") { # tcmalloc currently won't compile on Android. - source_set("tcmalloc") { + # TODO(crbug.com/559766) this should be a source_set but + # there are static initializers that get accidentally linked + # into chrome from vdso_support.cc that need to be addressed first. + static_library("tcmalloc") { tcmalloc_dir = "//third_party/tcmalloc/chromium" # Don't check tcmalloc's includes. These files include various files like |