| Index: third_party/WebKit/Source/web/web_tests.gyp
|
| diff --git a/third_party/WebKit/Source/web/web_tests.gyp b/third_party/WebKit/Source/web/web_tests.gyp
|
| index 7a4699e6ccd17b0683764e4266f89ab1b3edc381..794374891f61909a512d721763bf6efd44fd2305 100644
|
| --- a/third_party/WebKit/Source/web/web_tests.gyp
|
| +++ b/third_party/WebKit/Source/web/web_tests.gyp
|
| @@ -99,13 +99,6 @@
|
| },
|
| },
|
| },
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| }],
|
| ['OS=="android"', {
|
| 'type': 'shared_library',
|
| @@ -119,11 +112,6 @@
|
| '../../public/web/mac',
|
| ],
|
| }],
|
| - [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ],
|
| }
|
| ], # targets
|
|
|