commit 62546181d759aaf44216e6f32a79c89e55335c4e Author: Georg Koppen gk@torproject.org Date: Mon May 22 12:41:17 2017 +0000

fixup! TB3: Tor Browser's official .mozconfigs.

Make EME comment clearer for ESR52. --- .mozconfig | 2 +- .mozconfig-mac | 3 +-- .mozconfig-mingw | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.mozconfig b/.mozconfig index cde5b49..4eeb339 100755 --- a/.mozconfig +++ b/.mozconfig @@ -23,7 +23,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. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes ac_add_options --enable-jemalloc=4 diff --git a/.mozconfig-mac b/.mozconfig-mac index 7088e48..844ee2e 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -49,7 +49,6 @@ 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) +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/.mozconfig-mingw b/.mozconfig-mingw index de86c49b..af30573 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -21,7 +21,7 @@ ac_add_options --enable-verify-mar # 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. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service