Makefile

@@ -482,6 +482,12 @@ mullvadbrowser-release-linux-x86_64: submodule-update
 mullvadbrowser-release-linux-x86_64-asan: submodule-update
 	$(rbm) build release --target release --target browser-linux-x86_64-asan --target mullvadbrowser
 
+mullvadbrowser-release-linux-arm64: submodule-update
+	$(rbm) build release --target release --target browser-linux-arm64 --target mullvadbrowser
+
+mullvadbrowser-release-linux-armhf: submodule-update
+	$(rbm) build release --target release --target browser-linux-armhf --target mullvadbrowser
+
 mullvadbrowser-release-windows-x86_64: submodule-update
 	$(rbm) build release --target release --target browser-windows-x86_64 --target mullvadbrowser
 
@@ -503,6 +509,12 @@ mullvadbrowser-alpha-linux-x86_64: submodule-update
 mullvadbrowser-alpha-linux-x86_64-asan: submodule-update
 	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target mullvadbrowser
 
+mullvadbrowser-alpha-linux-arm64: submodule-update
+	$(rbm) build release --target alpha --target browser-linux-arm64 --target mullvadbrowser
+
+mullvadbrowser-alpha-linux-armhf: submodule-update
+	$(rbm) build release --target alpha --target browser-linux-armhf --target mullvadbrowser
+
 mullvadbrowser-alpha-windows-x86_64: submodule-update
 	$(rbm) build release --target alpha --target browser-windows-x86_64 --target mullvadbrowser
 
@@ -524,6 +536,12 @@ mullvadbrowser-nightly-linux-x86_64: submodule-update
 mullvadbrowser-nightly-linux-x86_64-asan: submodule-update
 	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target mullvadbrowser
 
+mullvadbrowser-nightly-linux-arm64: submodule-update
+	$(rbm) build release --target nightly --target browser-linux-arm64 --target mullvadbrowser
+
+mullvadbrowser-nightly-linux-armhf: submodule-update
+	$(rbm) build release --target nightly --target browser-linux-armhf --target mullvadbrowser
+
 mullvadbrowser-nightly-windows-x86_64: submodule-update
 	$(rbm) build release --target nightly --target browser-windows-x86_64 --target mullvadbrowser
 
@@ -545,6 +563,12 @@ mullvadbrowser-testbuild-linux-x86_64: submodule-update
 mullvadbrowser-testbuild-linux-x86_64-asan: submodule-update
 	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target mullvadbrowser
 
+mullvadbrowser-testbuild-linux-arm64: submodule-update
+	$(rbm) build release --target testbuild --target browser-linux-arm64 --target mullvadbrowser
+
+mullvadbrowser-testbuild-linux-armhf: submodule-update
+	$(rbm) build release --target testbuild --target browser-linux-armhf --target mullvadbrowser
+
 mullvadbrowser-testbuild-windows-x86_64: submodule-update
 	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target mullvadbrowser
 

projects/firefox/build

@@ -65,11 +65,21 @@ cd /var/tmp/build/[% project %]-[% c("version") %]
   patch -p1 < $rootdir/linux-arm-mozconfig.patch
 [% END -%]
 [% IF c("var/linux-arm64") -%]
-  patch -p1 < $rootdir/mozconfig-linux-arm64.patch
-  patch -p1 < $rootdir/fix-aarch64-syscall-number.patch
+  [% IF c("var/mullvad-browser") -%]
+    patch -p1 < $rootdir/mozconfig-mullvad-linux-arm64.patch
+  [% ELSE -%]
+    patch -p1 < $rootdir/mozconfig-linux-arm64.patch
+  [% END -%]
 [% END -%]
 [% IF c("var/linux-armhf") -%]
-  patch -p1 < $rootdir/mozconfig-linux-armhf.patch
+  [% IF c("var/mullvad-browser") -%]
+    patch -p1 < $rootdir/mozconfig-mullvad-linux-armhf.patch
+  [% ELSE -%]
+    patch -p1 < $rootdir/mozconfig-linux-armhf.patch
+  [% END -%]
+[% END -%]
+[% IF c("var/linux-arm64") -%]
+  patch -p1 < $rootdir/fix-aarch64-syscall-number.patch
 [% END -%]
 cat > .mozconfig << 'MOZCONFIG_EOF'
 [% INCLUDE mozconfig %]

projects/firefox/config

@@ -190,8 +190,12 @@ input_files:
     enable: '[% c("var/linux-arm64") || c("var/linux-armhf") %]'
   - filename: mozconfig-linux-arm64.patch
     enable: '[% c("var/linux-arm64") %]'
+  - filename: mozconfig-mullvad-linux-arm64.patch
+    enable: '[% c("var/linux-arm64") %]'
   - filename: mozconfig-linux-armhf.patch
     enable: '[% c("var/linux-armhf") %]'
+  - filename: mozconfig-mullvad-linux-armhf.patch
+    enable: '[% c("var/linux-armhf") %]'
   - filename: fix-aarch64-syscall-number.patch
     enable: '[% c("var/linux-arm64") %]'
   - project: rust

projects/firefox/mozconfig-mullvad-linux-arm64.patch

@@ -0,0 +1,14 @@
+diff -Nru a/mozconfig-linux-arm64 b/mozconfig-linux-arm64
+--- a/mozconfig-linux-arm64	1970-01-01 02:00:00.000000000 +0200
++++ b/mozconfig-linux-arm64	2022-12-30 10:19:42.517404109 +0200
+@@ -0,0 +1,10 @@
++. $topsrcdir/browser/config/mozconfigs/mullvad-browser
++
++ac_add_options --target=aarch64-unknown-linux-gnu
++
++ac_add_options --enable-default-toolkit=cairo-gtk3
++
++ac_add_options --disable-strip
++ac_add_options --disable-install-strip
++ac_add_options --disable-debug-symbols
++

projects/firefox/mozconfig-mullvad-linux-armhf.patch

@@ -0,0 +1,15 @@
+diff -Nru a/mozconfig-linux-armhf b/mozconfig-linux-armhf
+--- a/mozconfig-linux-armhf	1970-01-01 02:00:00.000000000 +0200
++++ b/mozconfig-linux-armhf	2022-12-30 10:19:31.749437431 +0200
+@@ -0,0 +1,11 @@
++. $topsrcdir/browser/config/mozconfigs/mullvad-browser
++
++ac_add_options --target=armv7-unknown-linux-gnueabihf
++
++ac_add_options --enable-default-toolkit=cairo-gtk3
++
++ac_add_options --disable-rust-simd
++ac_add_options --disable-strip
++ac_add_options --disable-install-strip
++ac_add_options --disable-debug-symbols
++

rbm.conf

@@ -469,6 +469,10 @@ targets:
     - linux-arm64
     - linux
     - basebrowser
+  mullvadbrowser-linux-arm64:
+    - linux-arm64
+    - linux
+    - mullvadbrowser
   torbrowser-linux-armhf:
     - linux-armhf
     - linux
@@ -477,6 +481,10 @@ targets:
     - linux-armhf
     - linux
     - basebrowser
+  mullvadbrowser-linux-armhf:
+    - linux-armhf
+    - linux
+    - mullvadbrowser
   torbrowser-linux-arm:
     - linux-arm
     - linux-cross