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

Side by Side Diff: webkit/media/webkit_media.gypi

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resolve comments Created 8 years 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 'conditions': [ 7 'conditions': [
8 ['OS == "android" or OS == "ios"', { 8 ['OS == "android" or OS == "ios"', {
9 # Android and iOS don't use ffmpeg. 9 # Android and iOS don't use ffmpeg.
10 'use_ffmpeg%': 0, 10 'use_ffmpeg%': 0,
(...skipping 11 matching lines...) Expand all
22 '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc. 22 '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc.
23 ], 23 ],
24 'dependencies': [ 24 'dependencies': [
25 '<(DEPTH)/base/base.gyp:base', 25 '<(DEPTH)/base/base.gyp:base',
26 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 26 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
27 '<(DEPTH)/media/media.gyp:shared_memory_support', 27 '<(DEPTH)/media/media.gyp:shared_memory_support',
28 '<(DEPTH)/media/media.gyp:yuv_convert', 28 '<(DEPTH)/media/media.gyp:yuv_convert',
29 '<(DEPTH)/skia/skia.gyp:skia', 29 '<(DEPTH)/skia/skia.gyp:skia',
30 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version _h', 30 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version _h',
31 ], 31 ],
32 'defines': [
33 'WEBKIT_MEDIA_IMPLEMENTATION',
34 ],
32 'sources': [ 35 'sources': [
33 'android/audio_decoder_android.cc', 36 'android/audio_decoder_android.cc',
34 'android/media_player_bridge_manager_impl.cc', 37 'android/media_player_bridge_manager_impl.cc',
35 'android/media_player_bridge_manager_impl.h', 38 'android/media_player_bridge_manager_impl.h',
36 'android/stream_texture_factory_android.h', 39 'android/stream_texture_factory_android.h',
37 'android/webmediaplayer_android.cc', 40 'android/webmediaplayer_android.cc',
38 'android/webmediaplayer_android.h', 41 'android/webmediaplayer_android.h',
39 'android/webmediaplayer_impl_android.cc', 42 'android/webmediaplayer_impl_android.cc',
40 'android/webmediaplayer_impl_android.h', 43 'android/webmediaplayer_impl_android.h',
41 'android/webmediaplayer_in_process_android.cc', 44 'android/webmediaplayer_in_process_android.cc',
(...skipping 16 matching lines...) Expand all
58 'crypto/key_systems.h', 61 'crypto/key_systems.h',
59 'crypto/ppapi_decryptor.cc', 62 'crypto/ppapi_decryptor.cc',
60 'crypto/ppapi_decryptor.h', 63 'crypto/ppapi_decryptor.h',
61 'crypto/proxy_decryptor.cc', 64 'crypto/proxy_decryptor.cc',
62 'crypto/proxy_decryptor.h', 65 'crypto/proxy_decryptor.h',
63 'filter_helpers.cc', 66 'filter_helpers.cc',
64 'filter_helpers.h', 67 'filter_helpers.h',
65 'media_stream_audio_renderer.cc', 68 'media_stream_audio_renderer.cc',
66 'media_stream_audio_renderer.h', 69 'media_stream_audio_renderer.h',
67 'media_stream_client.h', 70 'media_stream_client.h',
71 'media_switches.cc',
72 'media_switches.h',
68 'preload.h', 73 'preload.h',
69 'simple_video_frame_provider.cc', 74 'simple_video_frame_provider.cc',
70 'simple_video_frame_provider.h', 75 'simple_video_frame_provider.h',
71 'video_frame_provider.cc', 76 'video_frame_provider.cc',
72 'video_frame_provider.h', 77 'video_frame_provider.h',
78 'webkit_media_export.h',
73 'webmediaplayer_delegate.h', 79 'webmediaplayer_delegate.h',
74 'webmediaplayer_impl.cc', 80 'webmediaplayer_impl.cc',
75 'webmediaplayer_impl.h', 81 'webmediaplayer_impl.h',
76 'webmediaplayer_ms.cc', 82 'webmediaplayer_ms.cc',
77 'webmediaplayer_ms.h', 83 'webmediaplayer_ms.h',
78 'webmediaplayer_proxy.cc', 84 'webmediaplayer_proxy.cc',
79 'webmediaplayer_proxy.h', 85 'webmediaplayer_proxy.h',
80 'webmediaplayer_util.cc', 86 'webmediaplayer_util.cc',
81 'webmediaplayer_util.h', 87 'webmediaplayer_util.h',
82 'webvideoframe_impl.cc', 88 'webvideoframe_impl.cc',
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 # Not to strip important symbols by -Wl,-dead_strip. 182 # Not to strip important symbols by -Wl,-dead_strip.
177 '-Wl,-exported_symbol,_PPP_GetInterface', 183 '-Wl,-exported_symbol,_PPP_GetInterface',
178 '-Wl,-exported_symbol,_PPP_InitializeModule', 184 '-Wl,-exported_symbol,_PPP_InitializeModule',
179 '-Wl,-exported_symbol,_PPP_ShutdownModule' 185 '-Wl,-exported_symbol,_PPP_ShutdownModule'
180 ]}, 186 ]},
181 }], 187 }],
182 ], 188 ],
183 } 189 }
184 ], 190 ],
185 } 191 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698