Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 6c1b76e693735a0b89fa4e6b4900f3196f3f92f1..9e9895be7874a30497e857e0cd3359ac8474ce97 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -1388,16 +1388,6 @@ |
'filters/ffmpeg_demuxer_unittest.cc', |
], |
}], |
- |
- ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', { |
- 'conditions': [ |
- ['use_allocator!="none"', { |
- 'dependencies': [ |
- '../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
- ], |
- }], |
['OS=="android"', { |
'dependencies': [ |
'../testing/android/native_test.gyp:native_test_native_code', |
@@ -2032,17 +2022,6 @@ |
'ffmpeg/ffmpeg_regression_tests.cc', |
'test/pipeline_integration_test_base.cc', |
], |
- 'conditions': [ |
- ['os_posix==1 and OS!="mac"', { |
- 'conditions': [ |
- ['use_allocator!="none"', { |
- 'dependencies': [ |
- '../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
- ], |
- }], |
- ], |
}, |
], |
}], |