Commits:
-
513412ad
by Beatriz Rizental at 2026-11-16T14:34:17+01:00
TB 45396: Move the mozconfig options to tor-browser-build
Stop using the mozconfigs at the root of tor-browser.git and do not
source any mozconfig from it. The options shared by all builds are now
defaults in tor-browser.git's configure scripts, so we only set the
options specific to official builds here (target, linker, stripping,
ASan, LTO, etc.).
Pass --with-distribution-id only for upstream Firefox builds: Tor
Browser and Mullvad Browser now set their own as the default, and the
command line would override it.
Merge the mozconfig files of firefox and geckoview, and move the
options passed to mach configure to the mozconfig.
Use the options that also apply to upstream Firefox for the
firefox-browser build too, such as the target, optimization, LTO,
stripping, linker and geckodriver options, instead of only for Base
Browser and derived browsers. This also fixes the target of aarch64 and
armv7 firefox-browser builds, which previously defaulted to the host's
architecture.
Also remove options that are already the default (--disable-rust-debug),
use --enable-project instead of the deprecated --enable-application, and
deduplicate options that were set in both cases.
-
e6543f02
by Beatriz Rizental at 2026-11-16T14:34:17+01:00
Bug 41922: Remove ASan builds and the rlbox toggle
Drop the linux-x86_64-asan targets and every var/asan code path.
The var/rlbox toggle only existed so that ASan builds could disable
RLBox, so remove it too: wasi-sysroot is now always used for firefox and
geckoview, and we never pass --without-wasm-sandboxed-libraries.
17 changed files:
Changes:
Makefile
| ... |
... |
@@ -35,9 +35,6 @@ torbrowser-release-android-x86_64: submodule-update |
|
35
|
35
|
torbrowser-release-linux-x86_64: submodule-update
|
|
36
|
36
|
$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
|
|
37
|
37
|
|
|
38
|
|
-torbrowser-release-linux-x86_64-asan: submodule-update
|
|
39
|
|
- $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
|
|
40
|
|
-
|
|
41
|
38
|
torbrowser-release-linux-aarch64: submodule-update
|
|
42
|
39
|
$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
|
|
43
|
40
|
|
| ... |
... |
@@ -74,9 +71,6 @@ torbrowser-alpha-android-x86_64: submodule-update |
|
74
|
71
|
torbrowser-alpha-linux-x86_64: submodule-update
|
|
75
|
72
|
$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
|
|
76
|
73
|
|
|
77
|
|
-torbrowser-alpha-linux-x86_64-asan: submodule-update
|
|
78
|
|
- $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
|
|
79
|
|
-
|
|
80
|
74
|
torbrowser-alpha-linux-aarch64: submodule-update
|
|
81
|
75
|
$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
|
|
82
|
76
|
|
| ... |
... |
@@ -113,9 +107,6 @@ torbrowser-nightly-android-x86_64: submodule-update |
|
113
|
107
|
torbrowser-nightly-linux-x86_64: submodule-update
|
|
114
|
108
|
$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
|
|
115
|
109
|
|
|
116
|
|
-torbrowser-nightly-linux-x86_64-asan: submodule-update
|
|
117
|
|
- $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
|
|
118
|
|
-
|
|
119
|
110
|
torbrowser-nightly-linux-aarch64: submodule-update
|
|
120
|
111
|
$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
|
|
121
|
112
|
|
| ... |
... |
@@ -152,9 +143,6 @@ torbrowser-testbuild-android-x86_64: submodule-update |
|
152
|
143
|
torbrowser-testbuild-linux-x86_64: submodule-update
|
|
153
|
144
|
$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
|
|
154
|
145
|
|
|
155
|
|
-torbrowser-testbuild-linux-x86_64-asan: submodule-update
|
|
156
|
|
- $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
|
|
157
|
|
-
|
|
158
|
146
|
torbrowser-testbuild-linux-aarch64: submodule-update
|
|
159
|
147
|
$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
|
|
160
|
148
|
|
| ... |
... |
@@ -252,9 +240,6 @@ mullvadbrowser-release: submodule-update |
|
252
|
240
|
mullvadbrowser-release-linux-x86_64: submodule-update
|
|
253
|
241
|
$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
|
|
254
|
242
|
|
|
255
|
|
-mullvadbrowser-release-linux-x86_64-asan: submodule-update
|
|
256
|
|
- $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
|
|
257
|
|
-
|
|
258
|
243
|
mullvadbrowser-release-linux-aarch64: submodule-update
|
|
259
|
244
|
$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
|
|
260
|
245
|
|
| ... |
... |
@@ -273,9 +258,6 @@ mullvadbrowser-alpha: submodule-update |
|
273
|
258
|
mullvadbrowser-alpha-linux-x86_64: submodule-update
|
|
274
|
259
|
$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
|
|
275
|
260
|
|
|
276
|
|
-mullvadbrowser-alpha-linux-x86_64-asan: submodule-update
|
|
277
|
|
- $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
|
|
278
|
|
-
|
|
279
|
261
|
mullvadbrowser-alpha-linux-aarch64: submodule-update
|
|
280
|
262
|
$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
|
|
281
|
263
|
|
| ... |
... |
@@ -294,9 +276,6 @@ mullvadbrowser-nightly: submodule-update |
|
294
|
276
|
mullvadbrowser-nightly-linux-x86_64: submodule-update
|
|
295
|
277
|
$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
|
|
296
|
278
|
|
|
297
|
|
-mullvadbrowser-nightly-linux-x86_64-asan: submodule-update
|
|
298
|
|
- $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
|
|
299
|
|
-
|
|
300
|
279
|
mullvadbrowser-nightly-linux-aarch64: submodule-update
|
|
301
|
280
|
$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
|
|
302
|
281
|
|
| ... |
... |
@@ -315,9 +294,6 @@ mullvadbrowser-testbuild: submodule-update |
|
315
|
294
|
mullvadbrowser-testbuild-linux-x86_64: submodule-update
|
|
316
|
295
|
$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
|
|
317
|
296
|
|
|
318
|
|
-mullvadbrowser-testbuild-linux-x86_64-asan: submodule-update
|
|
319
|
|
- $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
|
|
320
|
|
-
|
|
321
|
297
|
mullvadbrowser-testbuild-linux-aarch64: submodule-update
|
|
322
|
298
|
$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
|
|
323
|
299
|
|
doc/MAKEFILE.txt
| ... |
... |
@@ -74,10 +74,6 @@ By default, macos builds are universal (targeting x86_64 and aarch64). |
|
74
|
74
|
With this special testbuild target, you can do a build for a specific
|
|
75
|
75
|
arch only.
|
|
76
|
76
|
|
|
77
|
|
-torbrowser-{release,alpha,nightly,testbuild}-linux-x86_64-asan
|
|
78
|
|
---------------------------------------------------------------
|
|
79
|
|
-Create a build for Linux x86_64 with Address Sanitizer enabled.
|
|
80
|
|
-
|
|
81
|
77
|
torbrowser-{release,alpha,nightly,testbuild}-src
|
|
82
|
78
|
------------------------------------------------
|
|
83
|
79
|
Create source tarballs for firefox and torbutton.
|
projects/browser/RelativeLink/start-browser
| ... |
... |
@@ -301,13 +301,6 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then |
|
301
|
301
|
fi
|
|
302
|
302
|
[% END -%]
|
|
303
|
303
|
|
|
304
|
|
-[% IF c("var/asan") -%]
|
|
305
|
|
-# We need to disable LSan which is enabled by default now. Otherwise we'll get
|
|
306
|
|
-# a crash during shutdown: https://bugs.torproject.org/10599#comment:59
|
|
307
|
|
-ASAN_OPTIONS="detect_leaks=0"
|
|
308
|
|
-export ASAN_OPTIONS
|
|
309
|
|
-[% END -%]
|
|
310
|
|
-
|
|
311
|
304
|
[% IF c("var/tor-browser") -%]
|
|
312
|
305
|
function setControlPortPasswd() {
|
|
313
|
306
|
local ctrlPasswd=$1
|
projects/firefox/README.md
| ... |
... |
@@ -50,8 +50,12 @@ References: |
|
50
|
50
|
|
|
51
|
51
|
## Firefox configuration
|
|
52
|
52
|
|
|
53
|
|
-We use `mozconfig`s from `tor-browser.git`, however we need to customize them to
|
|
54
|
|
-include the paths to our toolchain.
|
|
|
53
|
+The settings shared by every build, including development builds, are the
|
|
|
54
|
+defaults of the configure scripts in `tor-browser.git`.
|
|
|
55
|
+
|
|
|
56
|
+`mozconfig.in` adds the settings that are specific to official builds, such as
|
|
|
57
|
+the target, the linker and the stripping options.
|
|
|
58
|
+Also, we need to customize them to include the paths to our toolchain.
|
|
55
|
59
|
|
|
56
|
60
|
Also, we set a few other settings, that depend on the build we're running
|
|
57
|
61
|
(update channel, branding, source commit hash to display in `about:buildconfig`,
|
projects/firefox/build
| ... |
... |
@@ -40,10 +40,8 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/node/bi |
|
40
|
40
|
tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
|
|
41
|
41
|
export PATH="/var/tmp/dist/binutils/bin:$PATH"
|
|
42
|
42
|
[% END -%]
|
|
43
|
|
- # Use clang for everything on Linux now if we don't build with ASan.
|
|
44
|
|
- [% IF ! c("var/asan") -%]
|
|
45
|
|
- export PATH="/var/tmp/dist/clang-linux/bin:$PATH"
|
|
46
|
|
- [% END -%]
|
|
|
43
|
+ # Use clang for everything on Linux.
|
|
|
44
|
+ export PATH="/var/tmp/dist/clang-linux/bin:$PATH"
|
|
47
|
45
|
[% IF c("var/linux-cross") -%]
|
|
48
|
46
|
# Exporting `PKG_CONFIG_PATH` in the mozconfig file is causing build
|
|
49
|
47
|
# breakage in Rust code. It seems that environment variable is not passed
|
| ... |
... |
@@ -60,10 +58,8 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/node/bi |
|
60
|
58
|
tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/libdmg') %]
|
|
61
|
59
|
[% END %]
|
|
62
|
60
|
|
|
63
|
|
-[% IF c("var/rlbox") -%]
|
|
64
|
|
- tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]
|
|
65
|
|
- export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot
|
|
66
|
|
-[% END -%]
|
|
|
61
|
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]
|
|
|
62
|
+export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot
|
|
67
|
63
|
|
|
68
|
64
|
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
|
|
69
|
65
|
|
| ... |
... |
@@ -72,12 +68,6 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] |
|
72
|
68
|
cd /var/tmp/build/[% project %]-[% c("version") %]
|
|
73
|
69
|
cp $rootdir/mozconfig ./
|
|
74
|
70
|
|
|
75
|
|
-[% IF c("var/asan") -%]
|
|
76
|
|
- # Without disabling LSan our build is blowing up:
|
|
77
|
|
- # https://bugs.torproject.org/10599#comment:52
|
|
78
|
|
- export ASAN_OPTIONS="detect_leaks=0"
|
|
79
|
|
-[% END -%]
|
|
80
|
|
-
|
|
81
|
71
|
[% c("var/set_MOZ_BUILD_DATE") %]
|
|
82
|
72
|
|
|
83
|
73
|
[% IF c("var/windows") -%]
|
| ... |
... |
@@ -119,12 +109,7 @@ export LANG=C.UTF-8 |
|
119
|
109
|
[% END -%]
|
|
120
|
110
|
|
|
121
|
111
|
echo "Starting ./mach configure $(date)"
|
|
122
|
|
-./mach configure \
|
|
123
|
|
- --with-distribution-id=org.torproject \
|
|
124
|
|
- [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \
|
|
125
|
|
- [% IF c("var/updater_enabled") -%]--enable-update-channel=[% c("var/channel") %][% END %] \
|
|
126
|
|
- [% IF !c("var/firefox-browser") -%]--with-branding="$branding_dir"[% END %] \
|
|
127
|
|
- [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
|
|
|
112
|
+./mach configure
|
|
128
|
113
|
|
|
129
|
114
|
echo "Starting ./mach build $(date)"
|
|
130
|
115
|
./mach build --verbose
|
| ... |
... |
@@ -326,10 +311,6 @@ END; |
|
326
|
311
|
# Not copying libstdc++.so.* as that dups with the full libstdc++.so.6.0.xx the .6 links to
|
|
327
|
312
|
# and libstdc++.so.6.0.28-gdb.py which is also not needed
|
|
328
|
313
|
cp "/var/tmp/dist/gcc/$libdir/libstdc++.so.6" "$libdest"
|
|
329
|
|
- [% IF c("var/asan") -%]
|
|
330
|
|
- cp "/var/tmp/dist/gcc/$libdir/libasan.so."* "$libdest"
|
|
331
|
|
- cp "/var/tmp/dist/gcc/$libdir/libubsan.so."* "$libdest"
|
|
332
|
|
- [% END -%]
|
|
333
|
314
|
# Strip and generate debuginfo for libs
|
|
334
|
315
|
for LIB in "$libdest"/*so*
|
|
335
|
316
|
do
|
projects/firefox/config
| ... |
... |
@@ -191,7 +191,6 @@ input_files: |
|
191
|
191
|
enable: '[% c("var/has_l10n") %]'
|
|
192
|
192
|
- project: wasi-sysroot
|
|
193
|
193
|
name: wasi-sysroot
|
|
194
|
|
- enable: '[% c("var/rlbox") %]'
|
|
195
|
194
|
- project: node
|
|
196
|
195
|
name: node
|
|
197
|
196
|
- project: nasm
|
projects/firefox/mozconfig-upstream-firefox.in
deleted
|
1
|
|
-# The file mozconfig-upstream-firefox.in is used to set some options
|
|
2
|
|
-# needed to build upstream firefox. In Tor/Mullvad Browser, those
|
|
3
|
|
-# options are set in the specific mozconfig files in tor-browser.git.
|
|
4
|
|
-
|
|
5
|
|
-[% IF c("var/windows-x86_64") -%]
|
|
6
|
|
- ac_add_options --target=x86_64-pc-windows-gnu
|
|
7
|
|
- ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-
|
|
8
|
|
-[% END -%]
|
|
9
|
|
-[% IF c("var/windows-i686") -%]
|
|
10
|
|
- ac_add_options --target=i686-pc-windows-gnu
|
|
11
|
|
- ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
|
|
12
|
|
-[% END -%]
|
|
13
|
|
-[% IF c("var/windows") -%]
|
|
14
|
|
- ac_add_options --disable-notification-server
|
|
15
|
|
-
|
|
16
|
|
- ac_add_options --disable-webrtc
|
|
17
|
|
-[% END -%] |
projects/firefox/mozconfig.in
|
1
|
|
-[% IF !c("var/firefox-browser") -%]
|
|
2
|
|
- . $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %]
|
|
3
|
|
-[% ELSE;
|
|
4
|
|
- INCLUDE 'mozconfig-upstream-firefox.in';
|
|
5
|
|
- END -%]
|
|
|
1
|
+[% IF c("var/firefox-browser") -%]
|
|
|
2
|
+ # Tor Browser and Mullvad Browser set their own distribution ID as the
|
|
|
3
|
+ # default in tor-browser.git, so we only need to pass it for upstream
|
|
|
4
|
+ # Firefox, which would otherwise use org.mozilla.
|
|
|
5
|
+ ac_add_options --with-distribution-id=org.torproject
|
|
|
6
|
+[% ELSE -%]
|
|
|
7
|
+ export MOZILLA_OFFICIAL=1
|
|
|
8
|
+
|
|
|
9
|
+ ac_add_options --with-base-browser-version=[% c("var/torbrowser_version") %]
|
|
|
10
|
+ ac_add_options --with-branding=browser/branding/[% c("var/project_initials") %]-[% c("var/channel") %]
|
|
|
11
|
+[% END -%]
|
|
6
|
12
|
|
|
|
13
|
+ac_add_options --disable-tests
|
|
|
14
|
+ac_add_options --disable-bootstrap
|
|
7
|
15
|
ac_add_options --enable-optimize
|
|
8
|
16
|
ac_add_options --enable-rust-simd
|
|
9
|
17
|
ac_add_options --enable-lto=cross
|
|
10
|
18
|
|
|
11
|
19
|
[% IF c("var/linux") -%]
|
|
|
20
|
+ ac_add_options --enable-default-toolkit=cairo-gtk3
|
|
|
21
|
+
|
|
|
22
|
+ ac_add_options --disable-strip
|
|
|
23
|
+ ac_add_options --disable-install-strip
|
|
|
24
|
+
|
|
|
25
|
+ # Moz switched to lld for all Linux targets in Bug 1839739.
|
|
|
26
|
+ ac_add_options --enable-linker=lld
|
|
|
27
|
+
|
|
|
28
|
+ [% IF c("var/linux-x86_64") -%]
|
|
|
29
|
+ # tor-browser#44067: geckodriver has become a host-only tool
|
|
|
30
|
+ ac_add_options --enable-geckodriver
|
|
|
31
|
+ [% END -%]
|
|
|
32
|
+
|
|
|
33
|
+ [% IF c("var/linux-aarch64") -%]
|
|
|
34
|
+ ac_add_options --target=aarch64-unknown-linux-gnu
|
|
|
35
|
+ [% END -%]
|
|
|
36
|
+
|
|
12
|
37
|
# We want to build with clang now and point to the GCC toolchain until #29041 is
|
|
13
|
38
|
# fixed. We explicitly need to define the host compiler as well as for some
|
|
14
|
39
|
# reason the gcc-toolchain argument does not get passed along otherwise.
|
| ... |
... |
@@ -41,9 +66,21 @@ ac_add_options --enable-lto=cross |
|
41
|
66
|
|
|
42
|
67
|
clang_path=/var/tmp/dist/mingw-w64-clang
|
|
43
|
68
|
|
|
|
69
|
+ ac_add_options --target=[% c('arch') %]-pc-windows-gnu
|
|
44
|
70
|
ac_add_options --with-toolchain-prefix=[% c('arch') %]-w64-mingw32-
|
|
45
|
71
|
ac_add_options --enable-strip
|
|
46
|
72
|
|
|
|
73
|
+ # Bug 1782837: Not supported because Mozilla (and therefore also us) build
|
|
|
74
|
+ # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled.
|
|
|
75
|
+ ac_add_options --disable-notification-server
|
|
|
76
|
+
|
|
|
77
|
+ # tor-browser#44028: Disable zucchini for now, as it needs SEH.
|
|
|
78
|
+ ac_add_options --disable-zucchini
|
|
|
79
|
+
|
|
|
80
|
+ [% IF c("var/firefox-browser") -%]
|
|
|
81
|
+ ac_add_options --disable-webrtc
|
|
|
82
|
+ [% END -%]
|
|
|
83
|
+
|
|
47
|
84
|
# For Stylo
|
|
48
|
85
|
BINDGEN_CFLAGS="-I$clang_path/[% c('arch') %]-w64-mingw32/include/c++/v1 -I$clang_path/[% c('arch') %]-w64-mingw32/include"
|
|
49
|
86
|
[% END -%]
|
| ... |
... |
@@ -93,7 +130,12 @@ ac_add_options --enable-lto=cross |
|
93
|
130
|
ac_add_options --enable-strip
|
|
94
|
131
|
[% END -%]
|
|
95
|
132
|
|
|
96
|
|
-ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-updater
|
|
|
133
|
+[% IF c("var/updater_enabled") -%]
|
|
|
134
|
+ ac_add_options --enable-updater
|
|
|
135
|
+ ac_add_options --enable-update-channel=[% c("var/channel") %]
|
|
|
136
|
+[% ELSE -%]
|
|
|
137
|
+ ac_add_options --disable-updater
|
|
|
138
|
+[% END -%]
|
|
97
|
139
|
[% IF !c("var/firefox-browser") -%]
|
|
98
|
140
|
ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update
|
|
99
|
141
|
[% END -%]
|
projects/geckoview/README.md
| ... |
... |
@@ -57,9 +57,10 @@ More details on a way to do it are documented in |
|
57
|
57
|
|
|
58
|
58
|
# Mozconfig customization
|
|
59
|
59
|
|
|
60
|
|
-For Android, the majority of `mozconfig` customization is versioned in
|
|
61
|
|
-`tor-browser.git`.
|
|
|
60
|
+For Android, the majority of the settings are the defaults of the configure
|
|
|
61
|
+scripts in `tor-browser.git`.
|
|
62
|
62
|
|
|
63
|
|
-The only additional information we add in the build scripts are the commit hash
|
|
64
|
|
-we used for the build (to make it appear in `about:buildconfig`) and the channel
|
|
65
|
|
-of the build. |
|
|
63
|
+`mozconfig.in` adds the settings that are specific to official builds, such as
|
|
|
64
|
+the target, optimization, LTO and stripping options.
|
|
|
65
|
+Apart from that, we only add the commit hash we used for the build (to make it
|
|
|
66
|
+appear in `about:buildconfig`) and the channel of the build. |
projects/geckoview/build
| ... |
... |
@@ -9,10 +9,8 @@ tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/clang') %] |
|
9
|
9
|
export LLVM_CONFIG="/var/tmp/dist/clang-linux/bin/llvm-config"
|
|
10
|
10
|
export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang-linux/bin:$PATH"
|
|
11
|
11
|
|
|
12
|
|
-[% IF c("var/rlbox") -%]
|
|
13
|
|
- tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/wasi-sysroot') %]
|
|
14
|
|
- export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/
|
|
15
|
|
-[% END -%]
|
|
|
12
|
+tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/wasi-sysroot') %]
|
|
|
13
|
+export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/
|
|
16
|
14
|
|
|
17
|
15
|
[% INCLUDE 'build_common.sh' %]
|
|
18
|
16
|
|
projects/geckoview/build_common.sh
| ... |
... |
@@ -83,8 +83,4 @@ sed -i -e 's/-Xmx7g/-Xmx32g/' gradle.properties \ |
|
83
|
83
|
mobile/android/fenix/gradle.properties
|
|
84
|
84
|
|
|
85
|
85
|
echo "Starting ./mach configure $(date)"
|
|
86
|
|
-# We still need to specify --base-browser-version due to bug 34005.
|
|
87
|
|
-./mach configure \
|
|
88
|
|
- [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \
|
|
89
|
|
- [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \
|
|
90
|
|
- [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] |
|
|
86
|
+./mach configure |
projects/geckoview/config
| ... |
... |
@@ -46,7 +46,6 @@ var: |
|
46
|
46
|
variant: beta
|
|
47
|
47
|
has_l10n: '[% !c("var/testbuild") && !c("var/locales").empty %]'
|
|
48
|
48
|
l10n-changesets: '[% exec("git --no-pager show " _ c("git_hash") _ ":browser/locales/l10n-changesets.json", { exec_noco => 1 }) %]'
|
|
49
|
|
- mozconfig_file: 'mozconfig-[% c("var/osname") %]'
|
|
50
|
49
|
|
|
51
|
50
|
targets:
|
|
52
|
51
|
release:
|
| ... |
... |
@@ -80,8 +79,6 @@ steps: |
|
80
|
79
|
filename: 'geckoview-[% c("version") %]-apks-[% c("var/build_id") %]'
|
|
81
|
80
|
version: '[% c("abbrev") %]'
|
|
82
|
81
|
build_apk: '[% INCLUDE build_apk %]'
|
|
83
|
|
- var:
|
|
84
|
|
- mozconfig_file: 'mozconfig-android-all'
|
|
85
|
82
|
input_files:
|
|
86
|
83
|
- project: container-image
|
|
87
|
84
|
pkg_type: build
|
| ... |
... |
@@ -180,7 +177,6 @@ input_files: |
|
180
|
177
|
name: clang
|
|
181
|
178
|
- project: wasi-sysroot
|
|
182
|
179
|
name: wasi-sysroot
|
|
183
|
|
- enable: '[% c("var/rlbox") %]'
|
|
184
|
180
|
- project: application-services
|
|
185
|
181
|
name: application-services
|
|
186
|
182
|
enable: '[% !c("var/firefox-browser") %]'
|
projects/geckoview/mozconfig-upstream-firefox.in
deleted
|
1
|
|
-# The file mozconfig-upstream-firefox.in is used to set some options
|
|
2
|
|
-# needed to build upstream firefox. In Tor Browser, those options are
|
|
3
|
|
-# set in the specific mozconfig files in tor-browser.git.
|
|
4
|
|
-
|
|
5
|
|
-ac_add_options --enable-application=mobile/android
|
|
6
|
|
-
|
|
7
|
|
-# Make sure to disable bootstrap also when running online builds for dependency
|
|
8
|
|
-# updates.
|
|
9
|
|
-ac_add_options --disable-bootstrap
|
|
10
|
|
-
|
|
11
|
|
-CC="clang"
|
|
12
|
|
-CXX="clang++"
|
|
13
|
|
-ac_add_options --enable-linker=lld |
projects/geckoview/mozconfig.in
|
|
1
|
+ac_add_options --enable-project=mobile/android
|
|
|
2
|
+ac_add_options --disable-tests
|
|
|
3
|
+ac_add_options --enable-minify=properties,js
|
|
|
4
|
+# Make sure to disable bootstrap also when running online builds for
|
|
|
5
|
+# dependency updates.
|
|
|
6
|
+ac_add_options --disable-bootstrap
|
|
|
7
|
+
|
|
1
|
8
|
[% IF !c("var/firefox-browser") -%]
|
|
2
|
|
-. $topsrcdir/[% c("var/mozconfig_file") %]
|
|
3
|
|
-[% ELSE;
|
|
4
|
|
- INCLUDE 'mozconfig-upstream-firefox.in';
|
|
5
|
|
- END -%]
|
|
|
9
|
+ export MOZILLA_OFFICIAL=1
|
|
|
10
|
+
|
|
|
11
|
+ ac_add_options --with-base-browser-version=[% c("var/torbrowser_version") %]
|
|
|
12
|
+ ac_add_options --with-branding=mobile/android/branding/[% c("var/project_initials") %]-[% c("var/channel") %]
|
|
|
13
|
+[% END -%]
|
|
|
14
|
+
|
|
|
15
|
+[% IF c("step") == "build_apk" -%]
|
|
|
16
|
+ ac_add_options --disable-compile-environment
|
|
|
17
|
+[% ELSE -%]
|
|
|
18
|
+ CC="clang"
|
|
|
19
|
+ CXX="clang++"
|
|
|
20
|
+ ac_add_options --enable-linker=lld
|
|
|
21
|
+
|
|
|
22
|
+ ac_add_options --enable-optimize
|
|
|
23
|
+ ac_add_options --enable-rust-simd
|
|
|
24
|
+ ac_add_options --enable-lto=cross
|
|
|
25
|
+
|
|
|
26
|
+ ac_add_options --enable-strip
|
|
|
27
|
+ ac_add_options --enable-install-strip
|
|
|
28
|
+
|
|
|
29
|
+ [% IF c("var/android-aarch64") -%]
|
|
|
30
|
+ ac_add_options --target=aarch64-linux-android
|
|
|
31
|
+ [% ELSIF c("var/android-armv7") -%]
|
|
|
32
|
+ ac_add_options --target=arm-linux-androideabi
|
|
|
33
|
+ [% ELSIF c("var/android-x86_64") -%]
|
|
|
34
|
+ ac_add_options --target=x86_64-linux-android
|
|
|
35
|
+ [% END -%]
|
|
|
36
|
+[% END -%]
|
|
6
|
37
|
|
|
7
|
38
|
ac_add_options --with-java-bin-path=/usr/lib/jvm/java-1.17.0-openjdk-amd64/bin
|
|
8
|
39
|
ac_add_options --with-android-sdk=$ANDROID_HOME
|
projects/release/config
| ... |
... |
@@ -48,11 +48,6 @@ targets: |
|
48
|
48
|
var:
|
|
49
|
49
|
browser_platforms:
|
|
50
|
50
|
linux-x86_64: 1
|
|
51
|
|
- browser-linux-x86_64-asan:
|
|
52
|
|
- var:
|
|
53
|
|
- browser_platforms:
|
|
54
|
|
- linux-x86_64: 1
|
|
55
|
|
- asan-build: '-asan'
|
|
56
|
51
|
browser-linux-aarch64:
|
|
57
|
52
|
var:
|
|
58
|
53
|
browser_platforms:
|
| ... |
... |
@@ -172,7 +167,7 @@ input_files: |
|
172
|
167
|
enable: '[% c("var/browser_platforms/linux-x86_64") %]'
|
|
173
|
168
|
target:
|
|
174
|
169
|
- '[% c("var/build_target") %]'
|
|
175
|
|
- - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]'
|
|
|
170
|
+ - '[% c("var/browser_type") %]-linux-x86_64'
|
|
176
|
171
|
|
|
177
|
172
|
- name: linux-aarch64
|
|
178
|
173
|
project: browser
|
projects/tor/build
| ... |
... |
@@ -59,7 +59,6 @@ echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i |
|
59
|
59
|
./autogen.sh
|
|
60
|
60
|
find -type f -print0 | xargs -0 [% c("touch") %]
|
|
61
|
61
|
./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \
|
|
62
|
|
- [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \
|
|
63
|
62
|
[% IF c("var/windows") || c("var/android") || c("var/linux-cross") %]--with-zlib-dir="$zlibdir"[% END %] \
|
|
64
|
63
|
[% IF c("var/macos") %]--enable-static-openssl[% END %] \
|
|
65
|
64
|
[% IF c("var/windows") || c("var/android") %]--enable-static-libevent --enable-static-openssl --enable-static-zlib[% END %] \
|
rbm.conf
| ... |
... |
@@ -247,8 +247,6 @@ var: |
|
247
|
247
|
- zh-rCN
|
|
248
|
248
|
- zh-rTW
|
|
249
|
249
|
|
|
250
|
|
- rlbox: 1
|
|
251
|
|
-
|
|
252
|
250
|
sign_build: '[% ENV.RBM_SIGN_BUILD %]'
|
|
253
|
251
|
sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'
|
|
254
|
252
|
|
| ... |
... |
@@ -512,16 +510,6 @@ targets: |
|
512
|
510
|
- linux-x86_64
|
|
513
|
511
|
- linux
|
|
514
|
512
|
- firefoxbrowser
|
|
515
|
|
- torbrowser-linux-x86_64-asan:
|
|
516
|
|
- - linux-asan
|
|
517
|
|
- - linux-x86_64
|
|
518
|
|
- - linux
|
|
519
|
|
- - torbrowser
|
|
520
|
|
- mullvadbrowser-linux-x86_64-asan:
|
|
521
|
|
- - linux-asan
|
|
522
|
|
- - linux-x86_64
|
|
523
|
|
- - linux
|
|
524
|
|
- - mullvadbrowser
|
|
525
|
513
|
torbrowser-linux-aarch64:
|
|
526
|
514
|
- linux-cross
|
|
527
|
515
|
- linux-aarch64
|
| ... |
... |
@@ -581,13 +569,6 @@ targets: |
|
581
|
569
|
export DEB_BUILD_OPTIONS='hardening=+bindnow,+relro,+pie,+fortify,+stackprotector,+stackprotectorstrong,+format'
|
|
582
|
570
|
mkdir -p /var/tmp/build
|
|
583
|
571
|
eval $(cd /var/tmp/build; dpkg-buildflags --export=sh)
|
|
584
|
|
- linux-asan:
|
|
585
|
|
- var:
|
|
586
|
|
- asan: 1
|
|
587
|
|
- # RLBox needs clang to create .wasm files but we use mostly GCC for our
|
|
588
|
|
- # ASan builds. Thus, the compilation currently breaks with RLBox enabled.
|
|
589
|
|
- # See: tor-browser-build#40063.
|
|
590
|
|
- rlbox: 0
|
|
591
|
572
|
|
|
592
|
573
|
torbrowser-windows-i686:
|
|
593
|
574
|
- windows-i686
|
|