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

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: 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 | « media/base/browser_cdm.h ('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 bd6f659a27b52236fe280832b1c8848817ada970..f1d016f769b1572c9938052d970131554462083b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -611,6 +611,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',
@@ -1598,9 +1605,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',
« no previous file with comments | « media/base/browser_cdm.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698