| Index: build/config/allocator.gni
|
| diff --git a/build/config/allocator.gni b/build/config/allocator.gni
|
| index 0edb47a09bb21cda971e5116f6c5ec5ca8d83e8a..0dd3dcf3a3a9870a24694e93cd50a12c31ffbb2e 100644
|
| --- a/build/config/allocator.gni
|
| +++ b/build/config/allocator.gni
|
| @@ -13,7 +13,11 @@ if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
|
| _default_allocator = "tcmalloc"
|
| }
|
|
|
| -if ((is_linux || is_android) && !is_asan && !is_lsan && !is_tsan && !is_msan) {
|
| +# The debug CRT on Windows has some debug features that are incompatible with
|
| +# the shim. NaCl in particular does seem to link some binaries statically
|
| +# against the debug CRT with "is_nacl=false".
|
| +if ((is_linux || is_android || (is_win && !is_component_build && !is_debug)) &&
|
| + !is_asan && !is_lsan && !is_tsan && !is_msan) {
|
| _default_use_experimental_allocator_shim = true
|
| } else {
|
| _default_use_experimental_allocator_shim = false
|
|
|