Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1245789 - Added support for --enable-eme=widevine and expose MOZ_$(keySystem)_EME in dom/media/{eme,gmp}. r=glandium

Browse Source 
We need to not build Widevine by default, and when enabled we will need to be able to
ifdef on MOZ_WIDEVINE_EME (see next patch) so that we can not build the code on platforms
where it can't possibly work (Android specifcally, as Widevine isn't available as a
Chromium plugin there).



MozReview-Commit-ID: Avgz5NRcl9v
This commit is contained in:
Chris Pearce 2016-02-26 14:01:41 +13:00
parent da09cd13c1
commit 581bf9fd48
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/media/eme/moz.build
View File

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
for cdm in CONFIG['MOZ_EME_MODULES']:
DEFINES['MOZ_%s_EME' % cdm.upper()] = True
EXPORTS.mozilla.dom += [
'MediaEncryptedEvent.h',
'MediaKeyError.h',

5
dom/media/gmp/moz.build
View File

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
for cdm in CONFIG['MOZ_EME_MODULES']:
DEFINES['MOZ_%s_EME' % cdm.upper()] = True
XPIDL_MODULE = 'content_geckomediaplugins'
XPIDL_SOURCES += [
@ -114,7 +117,7 @@ if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin'):
'rlz',
]
if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Linux'):
if 'widevine' in CONFIG['MOZ_EME_MODULES']:
DIRS += [
'widevine-adapter',
]

2
toolkit/moz.configure
View File

@ -330,7 +330,7 @@ add_old_configure_assignment('MOZ_FMP4', fmp4)
# EME Support
# ==============================================================
option('--enable-eme', nargs='*', choices=('adobe',),
option('--enable-eme', nargs='*', choices=('adobe','widevine',),
help='Enable support for Encrypted Media Extensions')
@depends('--enable-eme', fmp4)