[tbb-commits] [tor-browser-build/master] Bug 27493: Clean up mozconfig options

[gk at torproject.org]

commit e361790e2540af786386b6a13ac9477d82267db7
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Sep 3 11:38:14 2019 +0000

    Bug 27493: Clean up mozconfig options
---
 projects/firefox/mozconfig-android-aarch64 | 1 +
 projects/firefox/mozconfig-android-armv7   | 1 +
 projects/firefox/mozconfig-android-x86     | 1 +
 projects/firefox/mozconfig-linux-i686      | 4 ----
 projects/firefox/mozconfig-linux-x86_64    | 4 ----
 projects/firefox/mozconfig-osx-x86_64      | 3 ---
 projects/firefox/mozconfig-windows-i686    | 2 --
 projects/firefox/mozconfig-windows-x86_64  | 2 --
 8 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64
index f5c1474..368ba6f 100644
--- a/projects/firefox/mozconfig-android-aarch64
+++ b/projects/firefox/mozconfig-android-aarch64
@@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
+ac_add_options --enable-proxy-bypass-protection
diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
index 75e1d78..35eac27 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
+ac_add_options --enable-proxy-bypass-protection
diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86
index be1efd6..8447347 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -42,3 +42,4 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
+ac_add_options --enable-proxy-bypass-protection
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index c8f19a4..da6cddf 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -2,9 +2,7 @@
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-mk_add_options MOZILLA_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 
 # We want to build with clang now and point to the GCC toolchain until #29041 is
 # fixed. We explicitly need to define the host compiler as well as for some
@@ -22,7 +20,6 @@ ac_add_options --target=i686-linux-gnu
 ac_add_options --enable-linker=bfd
 
 ac_add_options --enable-optimize
-#ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 
 # Let's support GTK3 for ESR60
@@ -41,4 +38,3 @@ ac_add_options --disable-webrtc
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
-#ac_add_options --disable-ctypes
diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index 12f1b28..e0a764f 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -2,9 +2,7 @@
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-mk_add_options MOZILLA_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 
 # We want to build with clang now and point to the GCC toolchain until #29041 is
 # fixed. We explicitly need to define the host compiler as well as for some
@@ -17,7 +15,6 @@ HOST_CXX=$CXX
 export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc'
 
 ac_add_options --enable-optimize
-#ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 
 # Let's support GTK3 for ESR60
@@ -36,4 +33,3 @@ ac_add_options --disable-webrtc
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
-#ac_add_options --disable-ctypes
diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 07dd023..29e6617 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -27,9 +27,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-mk_add_options MOZILLA_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 
 ac_add_options --enable-application=browser
 ac_add_options --enable-strip
@@ -48,4 +46,3 @@ ac_add_options --disable-tests
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
-# ac_add_options --disable-ctypes
diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index 5538bc1..86e86e7 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -19,9 +19,7 @@ ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
 ac_add_options --enable-default-toolkit=cairo-windows
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-mk_add_options MOZILLA_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 
 ac_add_options --disable-debug
 # Until we build on a 64bit host we need to hack around linker errors due to
diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64
index c95525b..2a128ae 100644
--- a/projects/firefox/mozconfig-windows-x86_64
+++ b/projects/firefox/mozconfig-windows-x86_64
@@ -19,9 +19,7 @@ ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-
 ac_add_options --enable-default-toolkit=cairo-windows
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-mk_add_options MOZILLA_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 
 ac_add_options --disable-debug
 ac_add_options --enable-optimize