Index: base/base.gyp |
diff --git a/base/base.gyp b/base/base.gyp |
index 44e0e72e8e9f9cae358ef5e08e47f8c5d3e8341e..a0482c500f6e77dae77e70bfb12163c6581cf64e 100644 |
--- a/base/base.gyp |
+++ b/base/base.gyp |
@@ -22,6 +22,7 @@ |
}, |
'dependencies': [ |
'allocator/allocator.gyp:allocator', |
+ 'allocator/allocator.gyp:allocator_features', |
'base_debugging_flags#target', |
'base_static', |
'base_build_date#target', |
@@ -234,6 +235,9 @@ |
'sync_socket_posix.cc', |
] |
}], |
+ ['use_experimental_allocator_shim==1', { |
+ 'dependencies': [ 'allocator/allocator.gyp:unified_allocator_shim'] |
+ }], |
], |
'sources': [ |
'auto_reset.h', |
@@ -717,6 +721,9 @@ |
'third_party/libevent/libevent.gyp:libevent' |
], |
}], |
+ ['use_experimental_allocator_shim==1', { |
+ 'sources': [ 'allocator/allocator_shim_unittest.cc'] |
+ }], |
], # conditions |
'target_conditions': [ |
['OS == "ios" and _toolset != "host"', { |