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

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: MEDIA_EXPORT 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
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/media/cdm_session_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index fb316803439777b44ff547b2d18392a3810f9413..dd10f21be7460b8f4eb53a11251ea995a9e0ed9d 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -255,10 +255,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',
@@ -828,6 +824,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"', {
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/media/cdm_session_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698