Index: base/allocator/BUILD.gn |
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn |
index 6d5484f0ba87adfc97017a0a50a3b2e73a9b9cbf..6ebbc1163e5c8269f4a4d045ceac500e3dfda3b9 100644 |
--- a/base/allocator/BUILD.gn |
+++ b/base/allocator/BUILD.gn |
@@ -16,7 +16,7 @@ declare_args() { |
# 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 && !is_asan |
+ !use_allocator_shim && !is_asan |
# This "allocator" meta-target will forward to the default allocator according |
# to the build settings. |
@@ -54,7 +54,7 @@ config("tcmalloc_flags") { |
"TCMALLOC_FOR_DEBUGALLOCATION", |
] |
} |
- if (use_experimental_allocator_shim) { |
+ if (use_allocator_shim) { |
defines += [ "TCMALLOC_DONT_REPLACE_SYSTEM_ALLOC" ] |
} |
if (is_clang) { |
@@ -261,7 +261,7 @@ if (use_allocator == "tcmalloc") { |
# //base/allocator/allocator_shim_override_glibc_weak_symbols.h and |
# //base/allocator/allocator_shim_internals.h for the definition of |
# SHIM_ALWAYS_EXPORT). |
- if (!use_experimental_allocator_shim) { |
+ if (!use_allocator_shim) { |
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] |
configs += [ "//build/config/gcc:symbol_visibility_default" ] |
} |
@@ -292,8 +292,8 @@ if (use_allocator == "tcmalloc") { |
buildflag_header("features") { |
header = "features.h" |
flags = [ |
- "USE_EXPERIMENTAL_ALLOCATOR_SHIM=$use_experimental_allocator_shim", |
- "ENABLE_WIN_ALLOCATOR_SHIM_TESTS=($use_experimental_allocator_shim || $win_use_allocator_shim)", |
+ "USE_ALLOCATOR_SHIM=$use_allocator_shim", |
+ "ENABLE_WIN_ALLOCATOR_SHIM_TESTS=($use_allocator_shim || $win_use_allocator_shim)", |
] |
} |