Commits:
-
5ad37bff
by Pier Angelo Vendrame at 2023-01-20T16:41:46+01:00
squash! Base Browser's .mozconfigs.
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 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
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 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
6 changed files:
Changes:
browser/moz.configure
| ... |
... |
@@ -5,11 +5,13 @@ |
|
5
|
5
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
6
|
6
|
|
|
7
|
7
|
imply_option("MOZ_PLACES", True)
|
|
8
|
|
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
|
|
|
8
|
+# tor-browser#32493
|
|
|
9
|
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
|
|
9
|
10
|
imply_option("MOZ_SERVICES_SYNC", True)
|
|
10
|
11
|
imply_option("MOZ_DEDICATED_PROFILES", True)
|
|
11
|
12
|
imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
|
|
12
|
|
-imply_option("MOZ_NORMANDY", True)
|
|
|
13
|
+# tor-browser#33734
|
|
|
14
|
+imply_option("MOZ_NORMANDY", False)
|
|
13
|
15
|
|
|
14
|
16
|
with only_when(target_is_linux & compile_environment):
|
|
15
|
17
|
option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
|
mobile/android/basebrowser.configure
|
|
1
|
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
|
2
|
+# vim: set filetype=python:
|
|
|
3
|
+# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
4
|
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
5
|
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
6
|
+
|
|
|
7
|
+# Set Base Browser default config
|
|
|
8
|
+# See tor-browser#25741 and tor-browser#41584.
|
|
|
9
|
+
|
|
|
10
|
+imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False)
|
|
|
11
|
+
|
|
|
12
|
+# Disable uploading crash reports and dump files to an external server
|
|
|
13
|
+# This is still configured in old-configure. Uncomment when this moves
|
|
|
14
|
+# to the python config
|
|
|
15
|
+# imply_option("MOZ_CRASHREPORTER", False)
|
|
|
16
|
+
|
|
|
17
|
+# Disable uploading information about the browser configuration and
|
|
|
18
|
+# performance to an external server. See tor-browser#32493.
|
|
|
19
|
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
|
|
|
20
|
+
|
|
|
21
|
+# Disable creating telemetry and data reports that are uploaded to an
|
|
|
22
|
+# external server
|
|
|
23
|
+# These aren't actually configure options. These are disabled in
|
|
|
24
|
+# confvars.sh, but they look like configure options so we'll document
|
|
|
25
|
+# them here, as well.
|
|
|
26
|
+# XXX: no confvars.sh here
|
|
|
27
|
+# imply_option("MOZ_TELEMETRY_REPORTING", False)
|
|
|
28
|
+# imply_option("MOZ_DATA_REPORTING", False)
|
|
|
29
|
+
|
|
|
30
|
+# tor-browser#24796: This controls some permissions in GeckoView's
|
|
|
31
|
+# AndroidManifest.xml
|
|
|
32
|
+imply_option("MOZ_ANDROID_NETWORK_STATE", False)
|
|
|
33
|
+imply_option("MOZ_ANDROID_LOCATION", False) |
mobile/android/confvars.sh
| ... |
... |
@@ -15,3 +15,9 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official |
|
15
|
15
|
MOZ_RAW=1
|
|
16
|
16
|
|
|
17
|
17
|
MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
|
|
|
18
|
+
|
|
|
19
|
+# Disable telemetry at compile-time
|
|
|
20
|
+unset MOZ_TELEMETRY_REPORTING
|
|
|
21
|
+
|
|
|
22
|
+# Disable data reporting at compile-time
|
|
|
23
|
+unset MOZ_DATA_REPORTING |
mobile/android/moz.configure
| ... |
... |
@@ -10,10 +10,11 @@ project_flag( |
|
10
|
10
|
default=True,
|
|
11
|
11
|
)
|
|
12
|
12
|
|
|
|
13
|
+# tor-browser#29859
|
|
13
|
14
|
project_flag(
|
|
14
|
15
|
"MOZ_ANDROID_HLS_SUPPORT",
|
|
15
|
16
|
help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)",
|
|
16
|
|
- default=True,
|
|
|
17
|
+ default=False,
|
|
17
|
18
|
)
|
|
18
|
19
|
|
|
19
|
20
|
option(
|
| ... |
... |
@@ -58,7 +59,10 @@ option( |
|
58
|
59
|
set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
|
|
59
|
60
|
|
|
60
|
61
|
imply_option("MOZ_NORMANDY", False)
|
|
61
|
|
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
|
|
|
62
|
+# Comment this so we can imply |False| in basebrowser.configure
|
|
|
63
|
+# The Build system doesn't allow multiple imply_option()
|
|
|
64
|
+# calls with the same key.
|
|
|
65
|
+# imply_option("MOZ_SERVICES_HEALTHREPORT", True)
|
|
62
|
66
|
imply_option("MOZ_ANDROID_HISTORY", True)
|
|
63
|
67
|
imply_option("--enable-small-chunk-size", True)
|
|
64
|
68
|
|
| ... |
... |
@@ -77,6 +81,8 @@ def check_target(target): |
|
77
|
81
|
)
|
|
78
|
82
|
|
|
79
|
83
|
|
|
|
84
|
+include("basebrowser.configure")
|
|
|
85
|
+
|
|
80
|
86
|
include("../../toolkit/moz.configure")
|
|
81
|
87
|
include("../../build/moz.configure/android-sdk.configure")
|
|
82
|
88
|
include("../../build/moz.configure/java.configure")
|
security/moz.build
| ... |
... |
@@ -85,7 +85,8 @@ gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin" |
|
85
|
85
|
gyp_vars["disable_tests"] = 1
|
|
86
|
86
|
gyp_vars["disable_dbm"] = 1
|
|
87
|
87
|
gyp_vars["disable_libpkix"] = 1
|
|
88
|
|
-gyp_vars["enable_sslkeylogfile"] = 1
|
|
|
88
|
+# tor-browser#18885, tor-browser#21849
|
|
|
89
|
+gyp_vars["enable_sslkeylogfile"] = 0
|
|
89
|
90
|
# pkg-config won't reliably find zlib on our builders, so just force it.
|
|
90
|
91
|
# System zlib is only used for modutil and signtool unless
|
|
91
|
92
|
# SSL zlib is enabled, which we are disabling immediately below this.
|
security/nss/lib/ssl/Makefile
| ... |
... |
@@ -41,7 +41,8 @@ endif |
|
41
|
41
|
|
|
42
|
42
|
# Enable key logging by default in debug builds, but not opt builds.
|
|
43
|
43
|
# Logging still needs to be enabled at runtime through env vars.
|
|
44
|
|
-NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1)
|
|
|
44
|
+# tor-browser#18885, tor-browser#21849
|
|
|
45
|
+NSS_ALLOW_SSLKEYLOGFILE ?= 0
|
|
45
|
46
|
ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE))
|
|
46
|
47
|
DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1
|
|
47
|
48
|
endif
|
|