| Index: cc/cc_tests.gyp
|
| diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
|
| index 94f1105de88e2be7538a413b92789eb33ecf173c..0bb4507b80e7e392fe2fec27f905bfca7892d853 100644
|
| --- a/cc/cc_tests.gyp
|
| +++ b/cc/cc_tests.gyp
|
| @@ -352,19 +352,6 @@
|
| ],
|
| }
|
| ],
|
| - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"',
|
| - {
|
| - 'conditions': [
|
| - [ 'use_allocator!="none"',
|
| - {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }
|
| - ],
|
| - ],
|
| - }
|
| - ],
|
| ],
|
| },
|
| {
|
| @@ -412,14 +399,6 @@
|
| ],
|
| }
|
| ],
|
| - # See http://crbug.com/162998#c4 for why this is needed.
|
| - ['OS=="linux" and use_allocator!="none"',
|
| - {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }
|
| - ],
|
| ],
|
| },
|
| {
|
|
|