| Index: build/config/allocator.gni
|
| diff --git a/build/config/allocator.gni b/build/config/allocator.gni
|
| index c79f930b3d911e1d2eb654813f6de593d53199be..06447af0b40660b00525bea0eea90b131a9ef6a2 100644
|
| --- a/build/config/allocator.gni
|
| +++ b/build/config/allocator.gni
|
| @@ -11,7 +11,7 @@ if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
|
| _default_allocator = "tcmalloc"
|
| }
|
|
|
| -if (is_linux && !is_asan && !is_lsan && !is_tsan && !is_msan) {
|
| +if ((is_linux || is_android) && !is_asan && !is_lsan && !is_tsan && !is_msan) {
|
| _default_use_experimental_allocator_shim = true
|
| } else {
|
| _default_use_experimental_allocator_shim = false
|
| @@ -30,5 +30,6 @@ declare_args() {
|
| assert(use_allocator == "none" || use_allocator == "tcmalloc")
|
|
|
| assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
|
| -assert(!use_experimental_allocator_shim || is_linux,
|
| - "use_experimental_allocator_shim supported only on Linux")
|
| +assert(
|
| + !use_experimental_allocator_shim || is_linux || is_android,
|
| + "use_experimental_allocator_shim supported only on Linux and Android targets")
|
|
|