| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index 5fafb4bfe33f02facbb678552a236f35ed7b9962..febbf3a3e96bff13016e0874ac0bc64a60e26270 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -758,11 +758,17 @@
|
| 'message_loop/message_pump_glib_unittest.cc',
|
| ]
|
| }],
|
| - ['OS == "linux" and use_allocator!="none"', {
|
| - 'dependencies': [
|
| - 'allocator/allocator.gyp:allocator',
|
| - ],
|
| - },
|
| + ['OS == "linux"', {
|
| + 'dependencies': [
|
| + 'malloc_wrapper',
|
| + ],
|
| + 'conditions': [
|
| + ['use_allocator!="none"', {
|
| + 'dependencies': [
|
| + 'allocator/allocator.gyp:allocator',
|
| + ],
|
| + }],
|
| + ]},
|
| ],
|
| ['OS == "win"', {
|
| 'sources!': [
|
| @@ -1327,6 +1333,20 @@
|
| },
|
| ],
|
| }],
|
| + ['OS == "linux"', {
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'malloc_wrapper',
|
| + 'type': 'shared_library',
|
| + 'dependencies': [
|
| + 'base',
|
| + ],
|
| + 'sources': [
|
| + 'test/malloc_wrapper.cc',
|
| + ],
|
| + }
|
| + ],
|
| + }],
|
| ['OS == "android"', {
|
| 'targets': [
|
| {
|
|
|