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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

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
« content/renderer/render_frame_impl.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index bbded6ff951b2a075585169d9a523d1d4c6dcd65..9cdb75323ce09e9346713846a93153bc5fe6fdae 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -609,6 +609,13 @@
'filters/vpx_video_decoder.h',
],
}],
+ ['enable_browser_cdms==1', {
+ 'sources': [
+ 'base/browser_cdm.cc',
+ 'base/browser_cdm.h',
+ 'base/browser_cdm_factory.h',
+ ],
+ }],
['OS=="android"', {
'dependencies': [
'media_android_jni_headers',
@@ -1596,9 +1603,6 @@
'base/android/webaudio_media_codec_bridge.cc',
'base/android/webaudio_media_codec_bridge.h',
'base/android/webaudio_media_codec_info.h',
- 'base/browser_cdm.cc',
- 'base/browser_cdm.h',
- 'base/browser_cdm_factory.h',
],
'dependencies': [
'../base/base.gyp:base',
« content/renderer/render_frame_impl.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698