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

Unified Diff: build/config/allocator.gni

Issue 1875173002: Reland of Enable allocator shim for Android (https://codereview.chromium.org/1875043003/) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for LLVM libc++ Created 4 years, 8 months 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/allocator.gni
diff --git a/build/config/allocator.gni b/build/config/allocator.gni
index b6444a2a730c09e6d493c8998cd2f4155b9d0cd5..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
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698