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

Unified Diff: content/content_renderer.gypi

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review. Please diff against PS1 for easy life. Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 284ead3288b95804ddd2f347d3714f2afec0eeca..9b1c8f94360d61328071d6156534954fb746c48a 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -253,10 +253,6 @@
'renderer/media/crypto/ppapi_decryptor.h',
'renderer/media/crypto/proxy_decryptor.cc',
'renderer/media/crypto/proxy_decryptor.h',
- 'renderer/media/crypto/proxy_media_keys.cc',
- 'renderer/media/crypto/proxy_media_keys.h',
- 'renderer/media/crypto/renderer_cdm_manager.cc',
- 'renderer/media/crypto/renderer_cdm_manager.h',
'renderer/media/media_stream_audio_level_calculator.cc',
'renderer/media/media_stream_audio_level_calculator.h',
'renderer/media/media_stream_audio_renderer.cc',
@@ -824,6 +820,14 @@
'renderer/media/crypto/ppapi_decryptor.h',
],
}],
+ ['enable_browser_cdms==1', {
+ 'sources': [
+ 'renderer/media/crypto/proxy_media_keys.cc',
+ 'renderer/media/crypto/proxy_media_keys.h',
+ 'renderer/media/crypto/renderer_cdm_manager.cc',
+ 'renderer/media/crypto/renderer_cdm_manager.h',
+ ],
+ }],
],
'target_conditions': [
['OS=="android"', {

Powered by Google App Engine
This is Rietveld 408576698