Index: build/config/allocator.gni |
diff --git a/build/config/allocator.gni b/build/config/allocator.gni |
index 10ac1adf0bd32b80a7bda79525769ed9dea2d68b..7d91fb5cb6a758cabc14a3e9dead3220d5b8d729 100644 |
--- a/build/config/allocator.gni |
+++ b/build/config/allocator.gni |
@@ -32,6 +32,17 @@ 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") |
+ |
+# TODO(siggi): NaCL doesn't appear to obey this configuration, but this is still |
brettw
2016/07/18 20:11:08
You can do this but there's no built-in feature fo
Sigurður Ásgeirsson
2016/07/19 13:44:50
I'm not sure how to do this. Adding this code:
---
|
+# irksome. Is there a way declare a flag which modulates the setting only |
+# under !is_nacl? |
+if (!is_nacl) { |
+ assert( |
+ !use_experimental_allocator_shim || is_linux || is_android || is_win, |
+ "use_experimental_allocator_shim supported only on Linux, Android and Windows targets") |
+} |
+ |
+if (is_win && use_experimental_allocator_shim) { |
+ assert(!is_component_build, |
+ "The allocator shim doesn't work for the component build on Windows.") |
+} |