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

Side by Side Diff: media/media.gyp

Issue 839763002: fix builds with vpx and/or ffmpeg disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add fixups Created 5 years, 11 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
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 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 'filters/ffmpeg_demuxer.h', 638 'filters/ffmpeg_demuxer.h',
639 'filters/ffmpeg_glue.cc', 639 'filters/ffmpeg_glue.cc',
640 'filters/ffmpeg_glue.h', 640 'filters/ffmpeg_glue.h',
641 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 641 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
642 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 642 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
643 'filters/ffmpeg_video_decoder.cc', 643 'filters/ffmpeg_video_decoder.cc',
644 'filters/ffmpeg_video_decoder.h', 644 'filters/ffmpeg_video_decoder.h',
645 'filters/in_memory_url_protocol.cc', 645 'filters/in_memory_url_protocol.cc',
646 'filters/in_memory_url_protocol.h', 646 'filters/in_memory_url_protocol.h',
647 ], 647 ],
648 'defines': [
649 'MEDIA_DISABLE_FFMPEG',
650 ],
651 'direct_dependent_settings': {
652 'defines': [
653 'MEDIA_DISABLE_FFMPEG',
654 ],
655 },
648 }], 656 }],
649 ['media_use_libvpx==1', { 657 ['media_use_libvpx==1', {
650 'dependencies': [ 658 'dependencies': [
651 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', 659 '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
652 ], 660 ],
653 }, { # media_use_libvpx==0 661 }, { # media_use_libvpx==0
662 'defines': [
663 'MEDIA_DISABLE_LIBVPX',
664 ],
654 'direct_dependent_settings': { 665 'direct_dependent_settings': {
655 'defines': [ 666 'defines': [
656 'MEDIA_DISABLE_LIBVPX', 667 'MEDIA_DISABLE_LIBVPX',
657 ], 668 ],
658 }, 669 },
659 # Exclude the sources that depend on libvpx. 670 # Exclude the sources that depend on libvpx.
660 'sources!': [ 671 'sources!': [
661 'filters/vpx_video_decoder.cc', 672 'filters/vpx_video_decoder.cc',
662 'filters/vpx_video_decoder.h', 673 'filters/vpx_video_decoder.h',
663 ], 674 ],
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1890 '../build/isolate.gypi', 1901 '../build/isolate.gypi',
1891 ], 1902 ],
1892 'sources': [ 1903 'sources': [
1893 'media_unittests.isolate', 1904 'media_unittests.isolate',
1894 ], 1905 ],
1895 }, 1906 },
1896 ], 1907 ],
1897 }], 1908 }],
1898 ], 1909 ],
1899 } 1910 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698