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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 81b770c5af4a0da6cc3cf95f9d3722a43f740a6a..5d311caee10a4cf606ca0ccef4a1a5065cdddafe 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -29,6 +29,9 @@
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
],
+ 'defines': [
+ 'WEBKIT_MEDIA_IMPLEMENTATION',
+ ],
'sources': [
'android/audio_decoder_android.cc',
'android/media_player_bridge_manager_impl.cc',
@@ -65,11 +68,14 @@
'media_stream_audio_renderer.cc',
'media_stream_audio_renderer.h',
'media_stream_client.h',
+ 'media_switches.cc',
+ 'media_switches.h',
'preload.h',
'simple_video_frame_provider.cc',
'simple_video_frame_provider.h',
'video_frame_provider.cc',
'video_frame_provider.h',
+ 'webkit_media_export.h',
'webmediaplayer_delegate.h',
'webmediaplayer_impl.cc',
'webmediaplayer_impl.h',

Powered by Google App Engine
This is Rietveld 408576698