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

Unified Diff: base/allocator/BUILD.gn

Issue 1584893002: Allow base to depend on allocator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move is_nacl condition to allocator group Created 4 years, 11 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/BUILD.gn ('k') | base/allocator/allocator.gyp » ('j') | base/base.gyp » ('J')
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 9d09a357af6efcaf2d73a551ee46cc1c54409b01..5270a91c491553f10d030301188ff47eb9a9068a 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -16,20 +16,22 @@ declare_args() {
enable_debugallocation = is_debug
}
-# Only executables and not libraries should depend on the allocator target;
-# only the application (the final executable) knows what allocator makes sense.
# This "allocator" meta-target will forward to the default allocator according
# to the build settings.
group("allocator") {
- public_deps = []
- if (use_allocator == "tcmalloc") {
- public_deps += [ ":tcmalloc" ]
- }
+ if (!is_nacl) {
+ deps = []
- # This condition expresses the win_use_allocator_shim in the GYP build.
- if (is_win && !is_component_build && visual_studio_version != "2015") {
- public_deps += [ ":allocator_shim" ]
- }
+ 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 config defines ALLOCATOR_SHIM in the same conditions that the allocator
@@ -107,10 +109,8 @@ if (is_win) {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
- public_configs = [ ":nocmt" ]
deps = [
":prep_libc",
- "//base",
]
}
}
« no previous file with comments | « base/BUILD.gn ('k') | base/allocator/allocator.gyp » ('j') | base/base.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698