| Index: base/BUILD.gn
|
| diff --git a/base/BUILD.gn b/base/BUILD.gn
|
| index 9d1c838e980c29d2af0380682195448c6351b9a9..ab23957a0cd3231e513df8d099ac113d9c3fc70a 100644
|
| --- a/base/BUILD.gn
|
| +++ b/base/BUILD.gn
|
| @@ -18,6 +18,7 @@
|
| # huge sequence of random-looking conditionals.
|
|
|
| import("//build/buildflag_header.gni")
|
| +import("//build/config/allocator.gni")
|
| import("//build/config/compiler/compiler.gni")
|
| import("//build/config/nacl/config.gni")
|
| import("//build/config/sysroot.gni")
|
| @@ -972,6 +973,7 @@ component("base") {
|
|
|
| deps = [
|
| "//base/allocator",
|
| + "//base/allocator:features",
|
| "//base/third_party/dynamic_annotations",
|
| "//third_party/modp_b64",
|
| ]
|
| @@ -988,6 +990,12 @@ component("base") {
|
| libs = [ "atomic" ]
|
| }
|
|
|
| + if (use_experimental_allocator_shim) {
|
| + # The allocator shim is part of the base API. This is to allow clients of
|
| + # base should to install hooks into the allocator path.
|
| + public_deps += [ "//base/allocator:unified_allocator_shim" ]
|
| + }
|
| +
|
| # Allow more direct string conversions on platforms with native utf8
|
| # strings
|
| if (is_mac || is_ios || is_chromeos) {
|
| @@ -1894,6 +1902,10 @@ test("base_unittests") {
|
| deps += [ ":base_profiler_test_support_library" ]
|
| }
|
|
|
| + if (use_experimental_allocator_shim) {
|
| + sources += [ "allocator/allocator_shim_unittest.cc" ]
|
| + }
|
| +
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
|
|