Bug 1289634 - Remove Widevine from Mozilla official mozconfigs, since it's enabled by default now. r=glandium
authorChris Pearce <cpearce@mozilla.com>
Mon, 01 Aug 2016 16:13:45 +1200
changeset 349606 8425f7f2409646645e237893bc3928cea1f1ab42
parent 349605 5eaaa9b300cccd09f52b245315ce9bdda176795f
child 349607 14ff1748f9487da63495df437798e473d3779d69
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [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 - Remove Widevine from Mozilla official mozconfigs, since it's enabled by default now. r=glandium MozReview-Commit-ID: F5NhvhUPz2G
browser/config/mozconfigs/macosx-universal/common-opt
browser/config/mozconfigs/win32/common-opt
browser/config/mozconfigs/win64/common-opt
--- a/browser/config/mozconfigs/macosx-universal/common-opt
+++ b/browser/config/mozconfigs/macosx-universal/common-opt
@@ -13,15 +13,10 @@ ac_add_options --with-mozilla-api-keyfil
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
 
-# Enable Widevine CDMs on MacOSX in Mozilla builds.
-# Enabled here on the assumption that downstream vendors will not be using
-# these build configs.
-ac_add_options --enable-eme=widevine
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@@ -26,15 +26,17 @@ export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
 
-# Enable Adobe Primetime and Widevine CDMs on 32-bit Windows in Mozilla builds.
+# Enable Adobe Primetime CDM on 32-bit Windows in Mozilla builds.
 # Enabled here on the assumption that downstream vendors will not be using
 # these build configs.
-ac_add_options --enable-eme=adobe,widevine
+# Note: Widevine is automatically enabled by the build, and can be
+# disabled with -widevine.
+ac_add_options --enable-eme=+adobe
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
--- a/browser/config/mozconfigs/win64/common-opt
+++ b/browser/config/mozconfigs/win64/common-opt
@@ -24,15 +24,17 @@ export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
-# Enable Adobe Primetime and Widevine CDMs on 64-bit Windows in Mozilla builds.
+# Enable Adobe Primetime CDM on 64-bit Windows in Mozilla builds.
 # Enabled here on the assumption that downstream vendors will not be using
 # these build configs.
-ac_add_options --enable-eme=adobe,widevine
+# Note: Widevine is automatically enabled by the build, and can be
+# disabled with -widevine.
+ac_add_options --enable-eme=+adobe
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1