commit cfcf68c7ef27d33f072a405ef7e99815f5e34c1d Author: Kathy Brade brade@pearlcrescent.com Date: Mon Sep 17 16:39:42 2018 -0400

Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds

This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. --- .mozconfig | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 4 files changed, 4 insertions(+)

diff --git a/.mozconfig b/.mozconfig index 909f107f2948..b19e10a24940 100755 --- a/.mozconfig +++ b/.mozconfig @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@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

ac_add_options --enable-optimize diff --git a/.mozconfig-asan b/.mozconfig-asan index 914195971e6e..be11dcbd967a 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -15,6 +15,7 @@ export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@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

ac_add_options --enable-address-sanitizer diff --git a/.mozconfig-mac b/.mozconfig-mac index 540c5b375336..a9fbe7967ead 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -33,6 +33,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 diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 05dd4d6168a8..71494b6e1b78 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -7,6 +7,7 @@ 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