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

Unified Diff: base/BUILD.gn

Issue 1584893002: Allow base to depend on allocator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 589af0823bac30ca2edb81640664afd16c4d18b7..495e7cf290e41c56bf60e75e7ce1d78172afca4f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -957,6 +957,10 @@ component("base") {
"//third_party/modp_b64",
]
+ if (!is_nacl) {
brettw 2016/01/19 20:20:33 I think the allocator should never be used in nacl
Primiano Tucci (use gerrit) 2016/01/20 14:11:43 Right.
+ deps += [ "//base/allocator" ]
+ }
+
public_deps = [
":base_paths",
":base_static",
@@ -1864,7 +1868,6 @@ test("base_unittests") {
":message_loop_tests",
":prefs",
":prefs_test_support",
- "//base/allocator",
"//base/test:run_all_unittests",
"//base/test:test_support",
"//base/third_party/dynamic_annotations",
@@ -1873,6 +1876,9 @@ test("base_unittests") {
"//third_party/icu",
]
+ # Some unittests depend on the ALLOCATOR_SHIM macro.
+ configs += [ "//base/allocator:allocator_shim_define" ]
+
data = [
"test/data/",
]
« no previous file with comments | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698