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

Side by Side Diff: media/media.gyp

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Fixed MediaDrmBridgeTest unit tests Created 5 years, 2 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
« no previous file with comments | « media/cdm/player_tracker_impl.cc ('k') | no next file » | 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 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 'base/android/media_player_android.h', 1858 'base/android/media_player_android.h',
1859 'base/android/media_player_bridge.cc', 1859 'base/android/media_player_bridge.cc',
1860 'base/android/media_player_bridge.h', 1860 'base/android/media_player_bridge.h',
1861 'base/android/media_player_listener.cc', 1861 'base/android/media_player_listener.cc',
1862 'base/android/media_player_listener.h', 1862 'base/android/media_player_listener.h',
1863 'base/android/media_player_manager.h', 1863 'base/android/media_player_manager.h',
1864 'base/android/media_resource_getter.cc', 1864 'base/android/media_resource_getter.cc',
1865 'base/android/media_resource_getter.h', 1865 'base/android/media_resource_getter.h',
1866 'base/android/media_source_player.cc', 1866 'base/android/media_source_player.cc',
1867 'base/android/media_source_player.h', 1867 'base/android/media_source_player.h',
1868 'base/android/media_task_runner.cc',
1869 'base/android/media_task_runner.h',
1868 'base/android/media_url_interceptor.h', 1870 'base/android/media_url_interceptor.h',
1869 'base/android/video_decoder_job.cc', 1871 'base/android/video_decoder_job.cc',
1870 'base/android/video_decoder_job.h', 1872 'base/android/video_decoder_job.h',
1871 'base/android/webaudio_media_codec_bridge.cc', 1873 'base/android/webaudio_media_codec_bridge.cc',
1872 'base/android/webaudio_media_codec_bridge.h', 1874 'base/android/webaudio_media_codec_bridge.h',
1873 'base/android/webaudio_media_codec_info.h', 1875 'base/android/webaudio_media_codec_info.h',
1874 ], 1876 ],
1875 'dependencies': [ 1877 'dependencies': [
1876 '../base/base.gyp:base', 1878 '../base/base.gyp:base',
1877 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ', 1879 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
2076 'dependencies': [ 2078 'dependencies': [
2077 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2079 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2078 ], 2080 ],
2079 }], 2081 }],
2080 ], 2082 ],
2081 }, 2083 },
2082 ], 2084 ],
2083 }], 2085 }],
2084 ], 2086 ],
2085 } 2087 }
OLDNEW
« no previous file with comments | « media/cdm/player_tracker_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698