Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 2a7d66bc0fa68570d3d89b4871fdb3a443700c9c..75da6096364f62fe2de2ebfb176a88780afaea22 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -891,11 +891,6 @@ |
}], |
], |
}], |
- ['toolkit_uses_gtk==1', { |
- 'dependencies': [ |
- '../build/linux/system.gyp:gtk', |
- ], |
- }], |
['target_arch=="ia32" or target_arch=="x64"', { |
'dependencies': [ |
'media_asm', |
@@ -1660,25 +1655,6 @@ |
'sources': [ |
'ffmpeg/ffmpeg_unittest.cc', |
], |
- 'conditions': [ |
- ['toolkit_uses_gtk==1', { |
- 'dependencies': [ |
- # Needed for the following #include chain: |
- # base/run_all_unittests.cc |
- # ../base/test_suite.h |
- # gtk/gtk.h |
- '../build/linux/system.gyp:gtk', |
- ], |
- 'conditions': [ |
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
- ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { |
- 'dependencies': [ |
- '../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
- ], |
- }], |
- ], |
}, |
{ |
'target_name': 'ffmpeg_regression_tests', |