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

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: Squash the use_experimental_allocator_shim for NaCL as per Brett's suggestion. 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
« no previous file with comments | « base/allocator/allocator_shim_unittest.cc ('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 10ac1adf0bd32b80a7bda79525769ed9dea2d68b..0edb47a09bb21cda971e5116f6c5ec5ca8d83e8a 100644
--- a/build/config/allocator.gni
+++ b/build/config/allocator.gni
@@ -29,9 +29,21 @@ declare_args() {
use_experimental_allocator_shim = _default_use_experimental_allocator_shim
}
+if (is_nacl) {
+ # Turn off the build flag for NaCL builds to minimize confusion, as NaCL
+ # doesn't support the heap shim.
+ use_experimental_allocator_shim = false
+}
+
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")
+ !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.")
+}
« no previous file with comments | « base/allocator/allocator_shim_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698