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

Side by Side Diff: media/media.gyp

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment for DEPS change. Created 5 years, 1 month 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
« no previous file with comments | « media/cdm/android_cdm_factory.cc ('k') | media/mojo/services/android_mojo_media_client.cc » ('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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 }], 706 }],
707 ['media_use_libwebm==1', { 707 ['media_use_libwebm==1', {
708 'dependencies': [ 708 'dependencies': [
709 '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm', 709 '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
710 ], 710 ],
711 'sources': [ 711 'sources': [
712 'capture/webm_muxer.cc', 712 'capture/webm_muxer.cc',
713 'capture/webm_muxer.h', 713 'capture/webm_muxer.h',
714 ], 714 ],
715 }], 715 }],
716 ['enable_browser_cdms==1', {
717 'sources': [
718 'base/browser_cdm_factory.cc',
719 'base/browser_cdm_factory.h',
720 ],
721 }],
722 ['OS=="android"', { 716 ['OS=="android"', {
723 'dependencies': [ 717 'dependencies': [
724 'media_android_jni_headers', 718 'media_android_jni_headers',
725 'media_java', 719 'media_java',
726 'player_android', 720 'player_android',
727 'video_capture_android_jni_headers', 721 'video_capture_android_jni_headers',
728 ], 722 ],
729 'sources!': [ 723 'sources!': [
730 'base/audio_video_metadata_extractor.cc', 724 'base/audio_video_metadata_extractor.cc',
731 'base/audio_video_metadata_extractor.h', 725 'base/audio_video_metadata_extractor.h',
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 }, 1826 },
1833 'includes': ['../build/jni_generator.gypi'], 1827 'includes': ['../build/jni_generator.gypi'],
1834 }, 1828 },
1835 { 1829 {
1836 # GN: //media/base/android:android 1830 # GN: //media/base/android:android
1837 'target_name': 'player_android', 1831 'target_name': 'player_android',
1838 'type': 'static_library', 1832 'type': 'static_library',
1839 'sources': [ 1833 'sources': [
1840 'base/android/access_unit_queue.cc', 1834 'base/android/access_unit_queue.cc',
1841 'base/android/access_unit_queue.h', 1835 'base/android/access_unit_queue.h',
1836 'base/android/android_cdm_factory.cc',
1837 'base/android/android_cdm_factory.h',
1842 'base/android/audio_decoder_job.cc', 1838 'base/android/audio_decoder_job.cc',
1843 'base/android/audio_decoder_job.h', 1839 'base/android/audio_decoder_job.h',
1844 'base/android/browser_cdm_factory_android.cc',
1845 'base/android/browser_cdm_factory_android.h',
1846 'base/android/demuxer_android.h', 1840 'base/android/demuxer_android.h',
1847 'base/android/demuxer_stream_player_params.cc', 1841 'base/android/demuxer_stream_player_params.cc',
1848 'base/android/demuxer_stream_player_params.h', 1842 'base/android/demuxer_stream_player_params.h',
1849 'base/android/media_client_android.cc', 1843 'base/android/media_client_android.cc',
1850 'base/android/media_client_android.h', 1844 'base/android/media_client_android.h',
1851 'base/android/media_codec_audio_decoder.cc', 1845 'base/android/media_codec_audio_decoder.cc',
1852 'base/android/media_codec_audio_decoder.h', 1846 'base/android/media_codec_audio_decoder.h',
1853 'base/android/media_codec_bridge.cc', 1847 'base/android/media_codec_bridge.cc',
1854 'base/android/media_codec_bridge.h', 1848 'base/android/media_codec_bridge.h',
1855 'base/android/media_codec_decoder.cc', 1849 'base/android/media_codec_decoder.cc',
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 'dependencies': [ 2108 'dependencies': [
2115 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2109 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2116 ], 2110 ],
2117 }], 2111 }],
2118 ], 2112 ],
2119 }, 2113 },
2120 ], 2114 ],
2121 }], 2115 }],
2122 ], 2116 ],
2123 } 2117 }
OLDNEW
« no previous file with comments | « media/cdm/android_cdm_factory.cc ('k') | media/mojo/services/android_mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698