[tbb-commits] [tor-browser-build/master] Merge branch 'bug_27493'

[gk at torproject.org]

commit ec79824470dcd6815ffd903c8c9974808859f9e5
Merge: 74f1468 e361790
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Sep 26 19:38:08 2019 +0000

    Merge branch 'bug_27493'

 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 --cc projects/firefox/mozconfig-linux-i686
index 0a05864,da6cddf..95d14c1
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@@ -18,8 -16,10 +16,7 @@@ export BINDGEN_CFLAGS='--gcc-toolchain=
  
  ac_add_options --target=i686-linux-gnu
  
 -# XXX: gold and lld break when linking libxul, resort to bfd
 -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
@@@ -36,7 -38,3 +33,6 @@@ ac_add_options --disable-webrt
  # 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
 +
 +# Bug 31448: ld.gold fails if we don't disable debug-symbols
 +ac_add_options --disable-debug-symbols
diff --cc projects/firefox/mozconfig-windows-i686
index eaa704f,86e86e7..60cf1c1
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@@ -19,11 -19,12 +19,9 @@@ ac_add_options --with-toolchain-prefix=
  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
 -# memory constraints
 -ac_add_options --disable-debug-symbols
  ac_add_options --enable-optimize
  ac_add_options --enable-strip
  ac_add_options --enable-official-branding