[tbb-commits] [tor-browser-build/master] Synchronize mozconfig files with their version from tor-browser.git

[boklm at torproject.org]

commit aa96f1ab37786d11529f8266a1eeca07b04e7016
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Aug 10 12:39:09 2017 +0200

    Synchronize mozconfig files with their version from tor-browser.git
    
    The main change is the removal of the --enable-jemalloc=4 option which
    was done with #22482.
---
 projects/firefox/mozconfig-linux-i686   | 3 +--
 projects/firefox/mozconfig-linux-x86_64 | 3 +--
 projects/firefox/mozconfig-osx-x86_64   | 3 +--
 projects/firefox/mozconfig-windows-i686 | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index 8b4ecb3..a7d75fa 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -31,7 +31,6 @@ 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/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index cde5b49..7d9ab1c 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -23,7 +23,6 @@ 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/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 1658e18..bc7a30e 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -50,7 +50,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/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index de86c49..af30573 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -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