| Index: ppapi/ppapi_tests.gypi
|
| diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
|
| index a6f90c9d959bfbffa6ebbe79c143d1d4aa95990f..b6b9fb6f54a3afb6f4422c8a9d9a062debebd042 100644
|
| --- a/ppapi/ppapi_tests.gypi
|
| +++ b/ppapi/ppapi_tests.gypi
|
| @@ -164,14 +164,6 @@
|
| 'proxy/ppapi_perftests.cc',
|
| 'proxy/ppp_messaging_proxy_perftest.cc',
|
| ],
|
| - 'conditions': [
|
| - # See http://crbug.com/162998#c4 for why this is needed.
|
| - ['OS=="linux" and use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| {
|
| # GN version: //ppapi:ppapi_unittests
|
| @@ -230,17 +222,6 @@
|
| 'shared_impl/time_conversion_unittest.cc',
|
| 'shared_impl/var_tracker_unittest.cc',
|
| ],
|
| - 'conditions': [
|
| - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
|
| - 'conditions': [
|
| - [ 'use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| {
|
| 'target_name': 'ppapi_example_skeleton',
|
|
|