| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index dc484f4a4a62b0d2aa9804b29ba98c235dc7f7a3..eec22a9ca04250b2588fbd04cdccf657249ed0ac 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -21,6 +21,7 @@
|
| 'optimize': 'max',
|
| },
|
| 'dependencies': [
|
| + 'allocator/allocator.gyp:allocator',
|
| 'base_debugging_flags#target',
|
| 'base_static',
|
| '../testing/gtest.gyp:gtest_prod',
|
| @@ -761,14 +762,7 @@
|
| 'dependencies': [
|
| 'malloc_wrapper',
|
| ],
|
| - 'conditions': [
|
| - ['use_allocator!="none"', {
|
| - 'dependencies': [
|
| - 'allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ]},
|
| - ],
|
| + }],
|
| [ 'OS == "win" and target_arch == "x64"', {
|
| 'sources': [
|
| 'profiler/win32_stack_frame_unwinder_unittest.cc',
|
| @@ -789,16 +783,6 @@
|
| 4267,
|
| ],
|
| 'conditions': [
|
| - # This is needed so base_unittests uses the allocator shim, as
|
| - # SecurityTest.MemoryAllocationRestriction* tests are dependent
|
| - # on tcmalloc.
|
| - # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
|
| - # their own test suite.
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - 'allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ['icu_use_data_file_flag==0', {
|
| # This is needed to trigger the dll copy step on windows.
|
| # TODO(mark): This should not be necessary.
|
|
|