summaryrefslogtreecommitdiff
path: root/chromium/base/allocator/allocator.gni
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/allocator/allocator.gni
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/allocator/allocator.gni')
-rw-r--r--chromium/base/allocator/allocator.gni6
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/base/allocator/allocator.gni b/chromium/base/allocator/allocator.gni
index 148e37d9106..8e23e49c162 100644
--- a/chromium/base/allocator/allocator.gni
+++ b/chromium/base/allocator/allocator.gni
@@ -33,7 +33,11 @@ declare_args() {
use_allocator_shim = _default_use_allocator_shim
}
-assert(use_allocator == "none" || use_allocator == "tcmalloc")
+assert(use_allocator == "none" || use_allocator == "tcmalloc" ||
+ use_allocator == "partition")
+
+# Don't ship this configuration, not ready yet.
+assert(!(use_allocator == "partition" && is_official_build))
assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
assert(!is_mac || use_allocator == "none", "Tcmalloc doesn't work on macOS.")