Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Side by Side Diff: media/media.gyp

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « jingle/jingle.gyp ('k') | net/net.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 'formats/mpeg/mpeg_audio_stream_parser_base.h', 884 'formats/mpeg/mpeg_audio_stream_parser_base.h',
885 ], 885 ],
886 'conditions': [ 886 'conditions': [
887 ['enable_mpeg2ts_stream_parser==1', { 887 ['enable_mpeg2ts_stream_parser==1', {
888 'defines': [ 888 'defines': [
889 'ENABLE_MPEG2TS_STREAM_PARSER', 889 'ENABLE_MPEG2TS_STREAM_PARSER',
890 ], 890 ],
891 }], 891 }],
892 ], 892 ],
893 }], 893 }],
894 ['toolkit_uses_gtk==1', {
895 'dependencies': [
896 '../build/linux/system.gyp:gtk',
897 ],
898 }],
899 ['target_arch=="ia32" or target_arch=="x64"', { 894 ['target_arch=="ia32" or target_arch=="x64"', {
900 'dependencies': [ 895 'dependencies': [
901 'media_asm', 896 'media_asm',
902 'media_mmx', 897 'media_mmx',
903 'media_sse', 898 'media_sse',
904 'media_sse2', 899 'media_sse2',
905 ], 900 ],
906 'sources': [ 901 'sources': [
907 'base/simd/convert_yuv_to_rgb_x86.cc', 902 'base/simd/convert_yuv_to_rgb_x86.cc',
908 ], 903 ],
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 '../base/base.gyp:test_support_base', 1648 '../base/base.gyp:test_support_base',
1654 '../base/base.gyp:test_support_perf', 1649 '../base/base.gyp:test_support_perf',
1655 '../testing/gtest.gyp:gtest', 1650 '../testing/gtest.gyp:gtest',
1656 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1651 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1657 'media', 1652 'media',
1658 'media_test_support', 1653 'media_test_support',
1659 ], 1654 ],
1660 'sources': [ 1655 'sources': [
1661 'ffmpeg/ffmpeg_unittest.cc', 1656 'ffmpeg/ffmpeg_unittest.cc',
1662 ], 1657 ],
1663 'conditions': [
1664 ['toolkit_uses_gtk==1', {
1665 'dependencies': [
1666 # Needed for the following #include chain:
1667 # base/run_all_unittests.cc
1668 # ../base/test_suite.h
1669 # gtk/gtk.h
1670 '../build/linux/system.gyp:gtk',
1671 ],
1672 'conditions': [
1673 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345 554
1674 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
1675 'dependencies': [
1676 '../base/allocator/allocator.gyp:allocator',
1677 ],
1678 }],
1679 ],
1680 }],
1681 ],
1682 }, 1658 },
1683 { 1659 {
1684 'target_name': 'ffmpeg_regression_tests', 1660 'target_name': 'ffmpeg_regression_tests',
1685 'type': 'executable', 1661 'type': 'executable',
1686 'dependencies': [ 1662 'dependencies': [
1687 '../base/base.gyp:test_support_base', 1663 '../base/base.gyp:test_support_base',
1688 '../testing/gmock.gyp:gmock', 1664 '../testing/gmock.gyp:gmock',
1689 '../testing/gtest.gyp:gtest', 1665 '../testing/gtest.gyp:gtest',
1690 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1666 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1691 '../ui/gfx/gfx.gyp:gfx_geometry', 1667 '../ui/gfx/gfx.gyp:gfx_geometry',
(...skipping 15 matching lines...) Expand all
1707 ], 1683 ],
1708 }], 1684 }],
1709 ], 1685 ],
1710 }], 1686 }],
1711 ], 1687 ],
1712 }, 1688 },
1713 ], 1689 ],
1714 }], 1690 }],
1715 ], 1691 ],
1716 } 1692 }
OLDNEW
« no previous file with comments | « jingle/jingle.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698