[tbb-commits] [tor-browser] 56/81: TB3: Tor Browser's official .mozconfigs.
gitolite role
git at cupani.torproject.org
Tue Oct 18 16:12:50 UTC 2022
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1
in repository tor-browser.
commit 936f08db496f55f793511cfc0654790f7301082d
Author: Mike Perry <mikeperry-git at torproject.org>
AuthorDate: Mon May 6 15:51:06 2013 -0700
TB3: Tor Browser's official .mozconfigs.
Also:
Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24
Changes needed to build Mac in 64bit
Bug 10715: Enable Webgl for mingw-w64 again.
Disable ICU when cross-compiling; clean-up.
Bug 15773: Enable ICU on OS X
Bug 15990: Don't build the sandbox with mingw-w64
Bug 12761: Switch to ESR 38 for OS X
Updating .mozconfig-asan
Bug 12516: Compile hardenend Tor Browser with -fwrapv
Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 13419: Add back ICU for Windows
Bug 21239: Use GTK2 for ESR52 Linux builds
Bug 23025: Add hardening flags for macOS
Bug 24478: Enable debug assertions and tests in our ASan builds
--enable-proxy-bypass-protection
Bug 27597: ASan build option in tor-browser-build is broken
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.
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 21849: Don't allow SSL key logging.
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 25741 - TBA: Disable features at compile-time
MOZ_NATIVE_DEVICES for casting and the media player
MOZ_TELEMETRY_REPORTING for telemetry
MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo)
Bug 25741 - TBA: Add default configure options in dedicated file
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 29859: Disable HLS support for now
Add --disable-tor-launcher build option
Add --enable-tor-browser-update build option
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40061: Omit the Windows default browser agent from the build
Bug 40107: Adapt .mozconfig-asan for ESR 78
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
---
browser/base/moz.build | 3 ++
browser/config/mozconfigs/base-browser | 2 -
browser/config/mozconfigs/tor-browser | 9 ++++
browser/config/mozconfigs/tor-browser-android | 10 +++++
browser/installer/Makefile.in | 4 ++
browser/moz.configure | 8 ++--
mobile/android/confvars.sh | 8 ++++
mobile/android/geckoview/build.gradle | 1 +
mobile/android/moz.configure | 9 +++-
mobile/android/torbrowser.configure | 30 +++++++++++++
moz.configure | 63 +++++++++++++++++++++++++++
mozconfig-android-aarch64 | 2 +-
mozconfig-android-all | 3 +-
mozconfig-android-armv7 | 2 +-
mozconfig-android-x86 | 2 +-
mozconfig-android-x86_64 | 2 +-
mozconfig-linux-arm | 2 +-
mozconfig-linux-i686 | 2 +-
mozconfig-linux-x86_64 | 2 +-
mozconfig-linux-x86_64-asan | 2 +-
mozconfig-linux-x86_64-dev | 5 ++-
mozconfig-macos-x86_64 | 4 +-
mozconfig-windows-i686 | 2 +-
mozconfig-windows-x86_64 | 2 +-
security/moz.build | 2 +-
security/nss/lib/ssl/Makefile | 2 +-
toolkit/modules/AppConstants.jsm | 15 +++++++
toolkit/modules/moz.build | 3 ++
28 files changed, 177 insertions(+), 24 deletions(-)
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 2d598b9a6e6b..b53346a5ad53 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -87,6 +87,9 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
# Impacts `/toolkit/content/license.html`.
DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True
+if CONFIG["TOR_BROWSER_UPDATE"]:
+ DEFINES["TOR_BROWSER_UPDATE"] = 1
+
JAR_MANIFESTS += ["jar.mn"]
GeneratedFile(
diff --git a/browser/config/mozconfigs/base-browser b/browser/config/mozconfigs/base-browser
index 6558b8f9847e..82b224f43ed1 100644
--- a/browser/config/mozconfigs/base-browser
+++ b/browser/config/mozconfigs/base-browser
@@ -37,5 +37,3 @@ ac_add_options --enable-base-browser
# Disable telemetry
ac_add_options MOZ_TELEMETRY_REPORTING=
-
-ac_add_options --with-relative-profile=BaseBrowser/Data/Browser
diff --git a/browser/config/mozconfigs/tor-browser b/browser/config/mozconfigs/tor-browser
new file mode 100644
index 000000000000..8969a88aeaf9
--- /dev/null
+++ b/browser/config/mozconfigs/tor-browser
@@ -0,0 +1,9 @@
+. $topsrcdir/browser/config/mozconfigs/base-browser
+
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+
+ac_add_options --with-relative-profile=TorBrowser/Data/Browser
+
+ac_add_options --enable-tor-browser-update
+
+ac_add_options --with-distribution-id=org.torproject
diff --git a/browser/config/mozconfigs/tor-browser-android b/browser/config/mozconfigs/tor-browser-android
new file mode 100644
index 000000000000..484f6303c6b4
--- /dev/null
+++ b/browser/config/mozconfigs/tor-browser-android
@@ -0,0 +1,10 @@
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
+
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+
+ac_add_options --disable-tor-browser-update
+ac_add_options --disable-verify-mar
+
+if test ! -z "$LOCAL_DEV_BUILD"; then
+ ac_add_options --with-tor-browser-version=dev-build
+fi
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 2e10e16f59a6..e1e0a15e86a0 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -82,6 +82,10 @@ endif
endif
endif
+ifdef TOR_BROWSER_UPDATE
+DEFINES += -DTOR_BROWSER_UPDATE
+endif
+
ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
DEFINES += -DMOZ_SHARED_MOZGLUE=1
endif
diff --git a/browser/moz.configure b/browser/moz.configure
index 8653bcbb165d..5a0b722b915e 100644
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -5,11 +5,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option("MOZ_PLACES", True)
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
imply_option("MOZ_SERVICES_SYNC", True)
-imply_option("MOZ_DEDICATED_PROFILES", True)
-imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
-imply_option("MOZ_NORMANDY", True)
+imply_option("MOZ_DEDICATED_PROFILES", False)
+imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)
+imply_option("MOZ_NORMANDY", False)
with only_when(target_is_linux & compile_environment):
option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index c1041f317d0f..59d8199b4947 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -15,3 +15,11 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
MOZ_RAW=1
MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
+
+### Tor Browser for Android ###
+
+# Disable telemetry at compile-time
+unset MOZ_TELEMETRY_REPORTING
+
+# Disable data reporting at compile-time
+unset MOZ_DATA_REPORTING
diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
index 9cb599d89b6d..194198efdd41 100644
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -46,6 +46,7 @@ android {
buildConfigField 'String', "MOZ_APP_DISPLAYNAME", "\"${mozconfig.substs.MOZ_APP_DISPLAYNAME}\"";
buildConfigField 'String', "MOZ_APP_UA_NAME", "\"${mozconfig.substs.MOZ_APP_UA_NAME}\"";
buildConfigField 'String', "MOZ_UPDATE_CHANNEL", "\"${mozconfig.substs.MOZ_UPDATE_CHANNEL}\"";
+ buildConfigField 'String', "TOR_BROWSER_VERSION", "\"${mozconfig.substs.TOR_BROWSER_VERSION}\"";
// MOZILLA_VERSION is oddly quoted from autoconf, but we don't have to handle it specially in Gradle.
buildConfigField 'String', "MOZILLA_VERSION", "\"${mozconfig.substs.MOZILLA_VERSION}\"";
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 0f846fc92bed..eedaa8c2b1d1 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -13,7 +13,7 @@ project_flag(
project_flag(
"MOZ_ANDROID_HLS_SUPPORT",
help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)",
- default=True,
+ default=False,
)
option(
@@ -58,7 +58,10 @@ option(
set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
imply_option("MOZ_NORMANDY", False)
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
+# Comment this so we can imply |False| in torbrowser.configure
+# The Build system doesn't allow multiple imply_option()
+# calls with the same key.
+# imply_option("MOZ_SERVICES_HEALTHREPORT", True)
imply_option("MOZ_ANDROID_HISTORY", True)
imply_option("--enable-small-chunk-size", True)
@@ -77,6 +80,8 @@ def check_target(target):
)
+include("torbrowser.configure")
+
include("../../toolkit/moz.configure")
include("../../build/moz.configure/android-sdk.configure")
include("../../build/moz.configure/java.configure")
diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure
new file mode 100644
index 000000000000..bcb725cae121
--- /dev/null
+++ b/mobile/android/torbrowser.configure
@@ -0,0 +1,30 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Set Tor Browser default config
+
+imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False)
+
+# Disable uploading crash reports and dump files to an external server
+# This is still configured in old-configure. Uncomment when this moves
+# to the python config
+# imply_option("MOZ_CRASHREPORTER", False)
+
+# Disable uploading information about the browser configuration and
+# performance to an external server
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
+
+# Disable creating telemetry and data reports that are uploaded to an
+# external server
+# These aren't actually configure options. These are disabled in
+# confvars.sh, but they look like configure options so we'll document
+# them here, as well.
+# XXX: no confvars.sh here
+# imply_option("MOZ_TELEMETRY_REPORTING", False)
+# imply_option("MOZ_DATA_REPORTING", False)
+
+imply_option("MOZ_ANDROID_NETWORK_STATE", False)
+imply_option("MOZ_ANDROID_LOCATION", False)
diff --git a/moz.configure b/moz.configure
index 5e98290c3ff2..7ec6d25a8ac1 100755
--- a/moz.configure
+++ b/moz.configure
@@ -1044,6 +1044,69 @@ def relative_profile(value, target):
set_define("RELATIVE_PROFILE_DIRECTORY", relative_profile)
+# Tor additions.
+
+option(
+ "--with-tor-browser-version",
+ nargs=1,
+ help="Set Tor Browser version, e.g., 7.0a1"
+)
+
+
+ at depends("--with-tor-browser-version")
+def tor_browser_version(value):
+ if not value:
+ die("--with-tor-browser-version is required for Tor Browser.")
+ return value[0]
+
+
+ at depends("--with-tor-browser-version")
+def tor_browser_version_quoted(value):
+ if not value:
+ die("--with-tor-browser-version is required for Tor Browser.")
+ return '"{}"'.format(value[0])
+
+
+set_config("TOR_BROWSER_VERSION", tor_browser_version)
+set_define("TOR_BROWSER_VERSION", tor_browser_version)
+set_define("TOR_BROWSER_VERSION_QUOTED", tor_browser_version_quoted)
+
+
+option(
+ "--enable-tor-browser-update",
+ help="Enable Tor Browser update"
+)
+
+
+ at depends("--enable-tor-browser-update")
+def tor_browser_update(value):
+ if value:
+ return True
+
+
+set_config("TOR_BROWSER_UPDATE", tor_browser_update)
+set_define("TOR_BROWSER_UPDATE", tor_browser_update)
+add_old_configure_assignment("TOR_BROWSER_UPDATE", tor_browser_update)
+
+
+option(
+ "--enable-tor-browser-data-outside-app-dir",
+ help="Enable Tor Browser data outside of app directory"
+)
+
+
+ at depends("--enable-tor-browser-data-outside-app-dir")
+def tor_browser_data_outside_app_dir(value):
+ if value:
+ return True
+
+
+set_define(
+ "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
+add_old_configure_assignment(
+ "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
+
+
# Please do not add configure checks from here on.
# Fallthrough to autoconf-based configure
diff --git a/mozconfig-android-aarch64 b/mozconfig-android-aarch64
index 5e166ec9ea8c..cd03397c1301 100644
--- a/mozconfig-android-aarch64
+++ b/mozconfig-android-aarch64
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser-android
+. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android
ac_add_options --target=aarch64-linux-android
diff --git a/mozconfig-android-all b/mozconfig-android-all
index 24ce81ac88da..0f6a675d591f 100644
--- a/mozconfig-android-all
+++ b/mozconfig-android-all
@@ -10,14 +10,13 @@ if test -n "$LOCAL_DEV_BUILD"; then
# You must use the "default" bogus channel for dev builds
ac_add_options --enable-update-channel=default
ac_add_options --without-wasm-sandboxed-libraries
+ ac_add_options --with-tor-browser-version=dev-build
else
# We want to have a similar fat .aar versioning as Mozilla and make it clear
# we are on the beta channel for GeckoView
ac_add_options --enable-update-channel=beta
fi
-ac_add_options --with-tor-browser-version=dev-build
-
ac_add_options --with-java-bin-path=$JAVA_HOME/bin
ac_add_options --with-android-sdk=$ANDROID_HOME
ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle
diff --git a/mozconfig-android-armv7 b/mozconfig-android-armv7
index 05468e50be53..fb005a976d12 100644
--- a/mozconfig-android-armv7
+++ b/mozconfig-android-armv7
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser-android
+. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
ac_add_options --target=arm-linux-androideabi
diff --git a/mozconfig-android-x86 b/mozconfig-android-x86
index ed1c88cf396e..9e42962ca222 100644
--- a/mozconfig-android-x86
+++ b/mozconfig-android-x86
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser-android
+. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android
ac_add_options --target=i686-linux-android
diff --git a/mozconfig-android-x86_64 b/mozconfig-android-x86_64
index f8f6a301d4fb..7ceece15fcb2 100644
--- a/mozconfig-android-x86_64
+++ b/mozconfig-android-x86_64
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser-android
+. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android
ac_add_options --target=x86_64-linux-android
diff --git a/mozconfig-linux-arm b/mozconfig-linux-arm
index 0a476ed03bb4..33546709108a 100644
--- a/mozconfig-linux-arm
+++ b/mozconfig-linux-arm
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
ac_add_options --target=arm-linux-gnueabihf
diff --git a/mozconfig-linux-i686 b/mozconfig-linux-i686
index 16a75279e665..4b03732c0e06 100644
--- a/mozconfig-linux-i686
+++ b/mozconfig-linux-i686
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
ac_add_options --target=i686-linux-gnu
diff --git a/mozconfig-linux-x86_64 b/mozconfig-linux-x86_64
index f14f1f4df86b..06cf6e75b14f 100644
--- a/mozconfig-linux-x86_64
+++ b/mozconfig-linux-x86_64
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
ac_add_options --enable-default-toolkit=cairo-gtk3
diff --git a/mozconfig-linux-x86_64-asan b/mozconfig-linux-x86_64-asan
index 62ca3feaad99..ec9c8c086eca 100644
--- a/mozconfig-linux-x86_64-asan
+++ b/mozconfig-linux-x86_64-asan
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev
index 833892b7ce03..af79d8699d71 100644
--- a/mozconfig-linux-x86_64-dev
+++ b/mozconfig-linux-x86_64-dev
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
# This mozconfig file is not used in official builds.
# It is only intended to be used when doing incremental Linux builds
@@ -12,3 +12,6 @@ ac_add_options --disable-strip
ac_add_options --disable-install-strip
ac_add_options --without-wasm-sandboxed-libraries
+
+ac_add_options --disable-tor-browser-update
+ac_add_options --with-tor-browser-version=dev-build
diff --git a/mozconfig-macos-x86_64 b/mozconfig-macos-x86_64
index 64f67c01ea15..b81001df5633 100644
--- a/mozconfig-macos-x86_64
+++ b/mozconfig-macos-x86_64
@@ -1,6 +1,8 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
ac_add_options --enable-strip
# See bug #41131
ac_add_options --disable-update-agent
+
+ac_add_options --enable-tor-browser-data-outside-app-dir
diff --git a/mozconfig-windows-i686 b/mozconfig-windows-i686
index 0bf54b252d6c..afe083885bfc 100644
--- a/mozconfig-windows-i686
+++ b/mozconfig-windows-i686
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
ac_add_options --target=i686-w64-mingw32
ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
diff --git a/mozconfig-windows-x86_64 b/mozconfig-windows-x86_64
index 0e74d4d09099..67bc37c4e5ff 100644
--- a/mozconfig-windows-x86_64
+++ b/mozconfig-windows-x86_64
@@ -1,4 +1,4 @@
-. $topsrcdir/browser/config/mozconfigs/base-browser
+. $topsrcdir/browser/config/mozconfigs/tor-browser
ac_add_options --target=x86_64-w64-mingw32
ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-
diff --git a/security/moz.build b/security/moz.build
index 5fc36caa1903..d830a88878cd 100644
--- a/security/moz.build
+++ b/security/moz.build
@@ -85,7 +85,7 @@ gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin"
gyp_vars["disable_tests"] = 1
gyp_vars["disable_dbm"] = 1
gyp_vars["disable_libpkix"] = 1
-gyp_vars["enable_sslkeylogfile"] = 1
+gyp_vars["enable_sslkeylogfile"] = 0
# pkg-config won't reliably find zlib on our builders, so just force it.
# System zlib is only used for modutil and signtool unless
# SSL zlib is enabled, which we are disabling immediately below this.
diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/ssl/Makefile
index 8a8b06f4b508..90571bb3e256 100644
--- a/security/nss/lib/ssl/Makefile
+++ b/security/nss/lib/ssl/Makefile
@@ -41,7 +41,7 @@ endif
# Enable key logging by default in debug builds, but not opt builds.
# Logging still needs to be enabled at runtime through env vars.
-NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1)
+NSS_ALLOW_SSLKEYLOGFILE ?= 0
ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE))
DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1
endif
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 5799b78178aa..1738ad24512c 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -354,6 +354,14 @@ this.AppConstants = Object.freeze({
MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",
+ TOR_BROWSER_VERSION: "@TOR_BROWSER_VERSION@",
+ TOR_BROWSER_DATA_OUTSIDE_APP_DIR:
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+ true,
+#else
+ false,
+#endif
+
DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",
@@ -460,6 +468,13 @@ this.AppConstants = Object.freeze({
false,
#endif
+ TOR_BROWSER_UPDATE:
+#ifdef TOR_BROWSER_UPDATE
+ true,
+#else
+ false,
+#endif
+
// Returns true for CN region build when distibution id set as 'MozillaOnline'
isChinaRepack() {
return (
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index f8f65aef789e..a537997c78ee 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -302,6 +302,9 @@ for var in (
if CONFIG[var]:
DEFINES[var] = True
+if CONFIG["TOR_BROWSER_UPDATE"]:
+ DEFINES["TOR_BROWSER_UPDATE"] = 1
+
JAR_MANIFESTS += ["jar.mn"]
DEFINES["TOPOBJDIR"] = TOPOBJDIR
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the tbb-commits
mailing list