diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 19:20:23 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 19:20:23 +0000 |
| commit | ce67da1b61fc3fb14778dc55c1a9a011b0eac20a (patch) | |
| tree | 2c779ce887b83326b3b873175e8e6d65148e6a3c /media | |
| parent | 1640d9b302e2fc5765f88a3f17414baf4ac6bbd3 (diff) | |
| download | chromium_src-ce67da1b61fc3fb14778dc55c1a9a011b0eac20a.zip chromium_src-ce67da1b61fc3fb14778dc55c1a9a011b0eac20a.tar.gz chromium_src-ce67da1b61fc3fb14778dc55c1a9a011b0eac20a.tar.bz2 | |
Remove all uses of toolkit_use_gtk in the gyp files.
BUG=297026
R=ben@chromium.org, brettw@chromium.org
Review URL: https://codereview.chromium.org/238633004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/media.gyp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/media/media.gyp b/media/media.gyp index 2a7d66b..75da609 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', |