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

Unified Diff: build/config/allocator.gni

Issue 2138173002: Hookup the generic heap intercept for Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Snip an errant curly. Created 4 years, 5 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
Index: build/config/allocator.gni
diff --git a/build/config/allocator.gni b/build/config/allocator.gni
index 10ac1adf0bd32b80a7bda79525769ed9dea2d68b..79350e5b4a7bcaf327fe4d36a4d1a004f45164bc 100644
--- a/build/config/allocator.gni
+++ b/build/config/allocator.gni
@@ -32,6 +32,12 @@ 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 || is_android,
- "use_experimental_allocator_shim supported only on Linux and Android targets")
+
+# NaCL doesn't obey any of this configuration.
+if (!(is_win && is_nacl)) {
Primiano Tucci (use gerrit) 2016/07/15 14:02:10 out of cusiosity why do you need this if? If is_w
Sigurður Ásgeirsson 2016/07/18 19:27:07 Yeah, this is messed up. I was under the impressio
+ assert(
+ !use_experimental_allocator_shim || is_linux || is_android || is_win,
+ "use_experimental_allocator_shim supported only on Linux, Android and Windows targets")
+}
+# TODO(siggi): assert that the experimental allocator is only enabled for
+# non-component builds on Windows.

Powered by Google App Engine
This is Rietveld 408576698