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/", |
] |