Commit d940c1e3 authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Georg Koppen
Browse files

Bug 16285: Disabling EME bits 

Disabling the EME related preferences is currently more a user interface/
possible user irritation related thing: On Windows no GMPs are downloaded
at all as the aus4 server does not know about our mingw-w64 build. And on
Linux and OS X there is no EME CDM yet.
parent 2cbe6eb5

.mozconfig

+3 −0
Original line number Diff line number Diff line
@@ -21,4 +21,7 @@ ac_add_options --disable-debug 
ac_add_options --disable-maintenance-service

ac_add_options --disable-crashreporter

ac_add_options --disable-webrtc

# Let's not compile EME at least until we can enable ClearKey and only Clearkey.

# (Apart from that there is no Adobe CRM module for Linux right now)

ac_add_options --disable-eme

#ac_add_options --disable-ctypes

.mozconfig-mac

+3 −0
Original line number Diff line number Diff line
@@ -32,4 +32,7 @@ ac_add_options --disable-crashreporter 
ac_add_options --disable-maintenance-service

ac_add_options --disable-webrtc

ac_add_options --disable-tests

# Let's not compile EME at least until we can enable ClearKey and only Clearkey.

# (Apart from that there is no Adobe CRM module for OS X right now)

ac_add_options --disable-eme

# ac_add_options --disable-ctypes

.mozconfig-mingw

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ ac_add_options --without-intl-api 
# We can't build the sandbox code with mingw-w64:

# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426

ac_add_options --disable-sandbox

# EME is not running without sandbox. Thus, don't compile it in the first place.

ac_add_options --disable-eme

ac_add_options --disable-crashreporter

ac_add_options --disable-maintenance-service

ac_add_options --disable-webrtc

browser/app/profile/000-tor-browser.js

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces 
// clever solution for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716.

pref("media.gmp-provider.enabled", false);

pref("media.gmp-manager.url.override", "data:text/plain,");

<<<<<<< HEAD

// EME prefs: Strictly speaking these prefs don't need to be set as we are

// using the --disable-eme compile flag. However, in order to not confuse users,

// who might stumble upon them while looking into about:config, we set them to