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

Unified Diff: base/allocator/BUILD.gn

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 | « no previous file | base/allocator/allocator_shim.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/BUILD.gn
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
index ebe0447f50fa87cdb87d403bd34f28cfff7ed35b..a9d708403303837da84024ba4c81aaa091e1c8c2 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -13,8 +13,10 @@ declare_args() {
enable_debugallocation = is_debug
}
-# Allocator shim is only enabled for Release static builds.
-win_use_allocator_shim = is_win && !is_component_build && !is_debug
+# The Windows-only allocator shim is only enabled for Release static builds, and
+# is mutually exclusive with the generalized shim.
+win_use_allocator_shim = is_win && !is_component_build && !is_debug &&
+ !use_experimental_allocator_shim
# This "allocator" meta-target will forward to the default allocator according
# to the build settings.
@@ -311,7 +313,14 @@ if (use_experimental_allocator_shim) {
"allocator_shim_override_cpp_symbols.h",
"allocator_shim_override_libc_symbols.h",
]
- if (is_linux && use_allocator == "tcmalloc") {
+ if (is_win) {
+ sources += [
+ "allocator_shim_default_dispatch_to_winheap.cc",
+ "allocator_shim_override_ucrt_symbols_win.h",
+ "winheap_stubs_win.cc",
+ "winheap_stubs_win.h",
+ ]
+ } else if (is_linux && use_allocator == "tcmalloc") {
sources += [
"allocator_shim_default_dispatch_to_tcmalloc.cc",
"allocator_shim_override_glibc_weak_symbols.h",
« no previous file with comments | « no previous file | base/allocator/allocator_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698