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

Unified Diff: base/allocator/BUILD.gn

Issue 1835433002: GN: Force use_allocator="none" in NaCl toolchains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | build/toolchain/gcc_toolchain.gni » ('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 887d544f197862bbdb746d65bbd6e4db906ba7fb..9fdb9566e3498f79aef3c2c6e6377dc356899c7d 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -20,19 +20,17 @@ declare_args() {
# This "allocator" meta-target will forward to the default allocator according
# to the build settings.
group("allocator") {
- if (!is_nacl) {
- deps = []
+ deps = []
- if (use_allocator == "tcmalloc") {
- deps += [ ":tcmalloc" ]
- }
+ if (use_allocator == "tcmalloc") {
+ deps += [ ":tcmalloc" ]
+ }
- # This condition expresses the win_use_allocator_shim in the GYP build.
- if (is_win && !is_component_build && visual_studio_version != "2015") {
- deps += [ ":allocator_shim" ]
- all_dependent_configs = [ ":nocmt" ]
- }
- } # !is_nacl
+ # This condition expresses the win_use_allocator_shim in the GYP build.
+ if (is_win && !is_component_build && visual_studio_version != "2015") {
+ deps += [ ":allocator_shim" ]
+ all_dependent_configs = [ ":nocmt" ]
+ }
}
# This config defines ALLOCATOR_SHIM in the same conditions that the allocator
« no previous file with comments | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698