Index: base/base.gyp |
diff --git a/base/base.gyp b/base/base.gyp |
index 46ec1aa88cec83a913c515ad45d07cc0960f9a2b..0388e98a886cbe201c841195c4a83ddd87f28aed 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', |
@@ -235,6 +236,9 @@ |
'sync_socket_posix.cc', |
] |
}], |
+ ['use_experimental_allocator_shim==1', { |
+ 'dependencies': [ 'allocator/allocator.gyp:unified_allocator_shim'] |
+ }], |
], |
'sources': [ |
'auto_reset.h', |
@@ -719,6 +723,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"', { |