Bug 1289634 - Enable Widevine EME by default in browser builds. r=glandium
authorChris Pearce <cpearce@mozilla.com>
Fri, 29 Jul 2016 17:14:55 +1200
changeset 308320 5eaaa9b300cccd09f52b245315ce9bdda176795f
parent 308319 31c69994270f3e26a1fac3661d4a40496bf90283
child 308321 8425f7f2409646645e237893bc3928cea1f1ab42
push id30532
push userkwierso@gmail.com
push dateFri, 05 Aug 2016 17:57:44 +0000
treeherdermozilla-central@192132a4cbc7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1289634
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289634 - Enable Widevine EME by default in browser builds. r=glandium MozReview-Commit-ID: F3Tcpat1uDW
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -339,17 +339,26 @@ def fmp4(value, target, wmf, applemedia)
         return True
 
 set_config('MOZ_FMP4', fmp4)
 set_define('MOZ_FMP4', fmp4)
 add_old_configure_assignment('MOZ_FMP4', fmp4)
 
 # EME Support
 # ==============================================================
-option('--enable-eme', nargs='*', choices=('adobe','widevine',),
+# Widevine is enabled by default in desktop browser builds.
+@depends(build_project, '--help')
+def eme_default(build_project, help):
+    if build_project == 'browser':
+        return 'widevine'
+
+option('--enable-eme',
+       nargs='*',
+       choices=('adobe','widevine',),
+       default=eme_default,
        help='Enable support for Encrypted Media Extensions')
 
 @depends('--enable-eme', fmp4)
 def eme(value, fmp4):
     enabled = bool(value)
     if value.origin == 'default':
         enabled = enabled or fmp4
     if enabled and not fmp4: