[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41040: Add configuration to rbm.conf to select channel and platforms - tbb-commits

10 Mar 2025


      morgan pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
f27def7c by Nicolas Vigier at 2025-03-10T12:07:48+01:00
Bug 41040: Add configuration to rbm.conf to select channel and platforms
The browser can now be built using `make torbrowser` and `make
mullvadbrowser`. In this case, the channel and platforms to build are
selected by the variables defined in rbm.conf:
* var/browser_default_channel
* var/browser_platforms
- - - - -
fb835be6 by Nicolas Vigier at 2025-03-10T13:42:15+01:00
Bug 41040: Update release prep alpha templates
The stable release prep templates should be updated in a separate commit
when this is backported to `maint-14.0`.
- - - - -
6 changed files:
- .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
- .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
- Makefile
- projects/release/build
- projects/release/config
- rbm.conf
Changes:
=====================================
.gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
=====================================
@@ -65,6 +65,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
     - [ ] `var/torbrowser_build`: updated to `${MULLVAD_BROWSER_BUILD_N}`
     - [ ] `var/browser_release_date`: updated to build date. For the build to be reproducible, the date should be in the past when building.
       - **⚠️ WARNING**: If we have updated `var/torbrowser_build` without updating the `firefox` tag, then we can leave this unchanged to avoid forcing a firefox re-build (e.g. when bumping `var/torbrowser_build` to build2, build3, etc due to non-firefox related build issues)
+    - [ ] `var/browser_platforms`: updated to enable the platforms included in this release
     - [ ] `var/torbrowser_incremental_from`: updated to previous Desktop version
       - **NOTE**: We try to build incrementals for the previous 3 desktop versions
       - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail
@@ -111,7 +112,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
 - [ ] Build the tag:
   - Run:
     ```bash
-    make mullvadbrowser-alpha && make mullvadbrowser-incrementals-alpha
+    make mullvadbrowser
     ```
     - [ ] Tor Project build machine
     - [ ] Local developer machine
=====================================
.gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
=====================================
@@ -65,6 +65,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
     - [ ] `var/torbrowser_build`: updated to `${TOR_BROWSER_BUILD_N}`
     - [ ] `var/browser_release_date`: updated to build date. For the build to be reproducible, the date should be in the past when building.
       - **⚠️ WARNING**: If we have updated `var/torbrowser_build` without updating the `firefox` or `geckoview` tags, then we can leave this unchanged to avoid forcing a firefox re-build (e.g. when bumping `var/torbrwoser_build` to build2, build3, etc due to non-firefox related build issues)
+    - [ ] `var/browser_platforms`: updated to enable the platforms included in this release
     - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from`: updated to previous Desktop version
       - **NOTE**: We try to build incrementals for the previous 3 desktop versions
       - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail
@@ -135,7 +136,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
 - [ ] Build the tag:
   - Run:
     ```bash
-    make torbrowser-alpha && make torbrowser-incrementals-alpha
+    make torbrowser
     ```
     - [ ] Tor Project build machine
     - [ ] Local developer machine
=====================================
Makefile
=====================================
@@ -1,196 +1,180 @@
 rbm=./rbm/rbm
+browser_default_channel=$(shell $(rbm) showconf release var/browser_default_channel)
-all: torbrowser-release
+.PHONY: torbrowser mullvadbrowser
+all: torbrowser mullvadbrowser
#######################
 # Tor Browser Targets #
 #######################
+torbrowser: submodule-update
+	@echo Building torbrowser-$(browser_default_channel)
+	$(MAKE) torbrowser-$(browser_default_channel)
+	@echo Building incrementals for torbrowser-$(browser_default_channel)
+	$(MAKE) torbrowser-incrementals-$(browser_default_channel)
+
 torbrowser-release: submodule-update
    $(rbm) build release --target release --target browser-all --target torbrowser
-torbrowser-release-android: submodule-update
-	$(rbm) build release --target release --target browser-all-android --target torbrowser
-
 torbrowser-release-android-armv7: submodule-update
-	$(rbm) build release --target release --target browser-android-armv7 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target torbrowser
torbrowser-release-android-x86: submodule-update
-	$(rbm) build release --target release --target browser-android-x86 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target torbrowser
torbrowser-release-android-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-android-x86_64 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target torbrowser
torbrowser-release-android-aarch64: submodule-update
-	$(rbm) build release --target release --target browser-android-aarch64 --target torbrowser
-
-torbrowser-release-desktop: submodule-update
-	$(rbm) build release --target release --target browser-all-desktop --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target torbrowser
torbrowser-release-linux-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
torbrowser-release-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64-asan --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
torbrowser-release-linux-i686: submodule-update
-	$(rbm) build release --target release --target browser-linux-i686 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target torbrowser
torbrowser-release-linux-aarch64: submodule-update
-	$(rbm) build release --target release --target browser-linux-aarch64 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
torbrowser-release-windows-i686: submodule-update
-	$(rbm) build release --target release --target browser-windows-i686 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-windows-i686 --target torbrowser
torbrowser-release-windows-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-windows-x86_64 --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
torbrowser-release-macos: submodule-update
-	$(rbm) build release --target release --target browser-macos --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target torbrowser
torbrowser-release-src: submodule-update
-	$(rbm) build release --target release --target browser-src --target torbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-src --target torbrowser
torbrowser-alpha: submodule-update
    $(rbm) build release --target alpha --target browser-all --target torbrowser
-torbrowser-alpha-android: submodule-update
-	$(rbm) build release --target alpha --target browser-all-android --target torbrowser
-
 torbrowser-alpha-android-armv7: submodule-update
-	$(rbm) build release --target alpha --target browser-android-armv7 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target torbrowser
torbrowser-alpha-android-x86: submodule-update
-	$(rbm) build release --target alpha --target browser-android-x86 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target torbrowser
torbrowser-alpha-android-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-android-x86_64 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target torbrowser
torbrowser-alpha-android-aarch64: submodule-update
-	$(rbm) build release --target alpha --target browser-android-aarch64 --target torbrowser
-
-torbrowser-alpha-desktop: submodule-update
-	$(rbm) build release --target alpha --target browser-all-desktop --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target torbrowser
torbrowser-alpha-linux-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
torbrowser-alpha-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
torbrowser-alpha-linux-aarch64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-aarch64 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
torbrowser-alpha-linux-i686: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-i686 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target torbrowser
torbrowser-alpha-windows-i686: submodule-update
-	$(rbm) build release --target alpha --target browser-windows-i686 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target torbrowser
torbrowser-alpha-windows-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-windows-x86_64 --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
torbrowser-alpha-macos: submodule-update
-	$(rbm) build release --target alpha --target browser-macos --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target torbrowser
torbrowser-alpha-src: submodule-update
-	$(rbm) build release --target alpha --target browser-src --target torbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target torbrowser
torbrowser-nightly: submodule-update
    $(rbm) build release --target nightly --target browser-all --target torbrowser
-torbrowser-nightly-android: submodule-update
-	$(rbm) build release --target nightly --target browser-all-android --target torbrowser
-
 torbrowser-nightly-android-armv7: submodule-update
-	$(rbm) build release --target nightly --target browser-android-armv7 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target torbrowser
torbrowser-nightly-android-x86: submodule-update
-	$(rbm) build release --target nightly --target browser-android-x86 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target torbrowser
torbrowser-nightly-android-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-android-x86_64 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target torbrowser
torbrowser-nightly-android-aarch64: submodule-update
-	$(rbm) build release --target nightly --target browser-android-aarch64 --target torbrowser
-
-torbrowser-nightly-desktop: submodule-update
-	$(rbm) build release --target nightly --target browser-all-desktop --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target torbrowser
torbrowser-nightly-linux-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
torbrowser-nightly-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
torbrowser-nightly-linux-aarch64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-aarch64 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
torbrowser-nightly-linux-i686: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-i686 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target torbrowser
torbrowser-nightly-windows-i686: submodule-update
-	$(rbm) build release --target nightly --target browser-windows-i686 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target torbrowser
torbrowser-nightly-windows-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-windows-x86_64 --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
torbrowser-nightly-macos: submodule-update
-	$(rbm) build release --target nightly --target browser-macos --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target torbrowser
torbrowser-nightly-src: submodule-update
-	$(rbm) build release --target nightly --target browser-src --target torbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target torbrowser
torbrowser-testbuild: submodule-update
    $(rbm) build release --target testbuild --target browser-all --target torbrowser
-torbrowser-testbuild-android: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-android --target torbrowser
-
 torbrowser-testbuild-android-armv7: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-armv7 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target torbrowser
torbrowser-testbuild-android-x86: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-x86 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target torbrowser
torbrowser-testbuild-android-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-x86_64 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target torbrowser
torbrowser-testbuild-android-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-aarch64 --target torbrowser
-
-torbrowser-testbuild-desktop: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target torbrowser
torbrowser-testbuild-linux-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
torbrowser-testbuild-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
torbrowser-testbuild-linux-i686: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-i686 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target torbrowser
torbrowser-testbuild-linux-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-aarch64 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
torbrowser-testbuild-windows-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
torbrowser-testbuild-windows-i686: submodule-update
-	$(rbm) build release --target testbuild --target browser-windows-i686 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-i686 --target torbrowser
torbrowser-testbuild-macos: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target torbrowser
torbrowser-testbuild-macos-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target torbrowser
torbrowser-testbuild-macos-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target torbrowser
torbrowser-testbuild-src: submodule-update
-	$(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target torbrowser
torbrowser-incrementals-release: submodule-update
    $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
@@ -259,188 +243,164 @@ torbrowser-compare-mar-signed-unsigned-alpha: submodule-update
 basebrowser-release: submodule-update
    $(rbm) build release --target release --target browser-all --target basebrowser
-basebrowser-release-android: submodule-update
-	$(rbm) build release --target release --target browser-all-android --target basebrowser
-
 basebrowser-release-android-armv7: submodule-update
-	$(rbm) build release --target release --target browser-android-armv7 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target basebrowser
basebrowser-release-android-x86: submodule-update
-	$(rbm) build release --target release --target browser-android-x86 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target basebrowser
basebrowser-release-android-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-android-x86_64 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target basebrowser
basebrowser-release-android-aarch64: submodule-update
-	$(rbm) build release --target release --target browser-android-aarch64 --target basebrowser
-
-basebrowser-release-desktop: submodule-update
-	$(rbm) build release --target release --target browser-all-desktop --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser
basebrowser-release-linux-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
basebrowser-release-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64-asan --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
basebrowser-release-linux-i686: submodule-update
-	$(rbm) build release --target release --target browser-linux-i686 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target basebrowser
basebrowser-release-linux-aarch64: submodule-update
-	$(rbm) build release --target release --target browser-linux-aarch64 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
basebrowser-release-windows-i686: submodule-update
-	$(rbm) build release --target release --target browser-windows-i686 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-windows-i686 --target basebrowser
basebrowser-release-windows-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-windows-x86_64 --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
basebrowser-release-macos: submodule-update
-	$(rbm) build release --target release --target browser-macos --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target basebrowser
basebrowser-release-src: submodule-update
-	$(rbm) build release --target release --target browser-src --target basebrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-src --target basebrowser
basebrowser-alpha: submodule-update
    $(rbm) build release --target alpha --target browser-all --target basebrowser
-basebrowser-alpha-android: submodule-update
-	$(rbm) build release --target alpha --target browser-all-android --target basebrowser
-
 basebrowser-alpha-android-armv7: submodule-update
-	$(rbm) build release --target alpha --target browser-android-armv7 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target basebrowser
basebrowser-alpha-android-x86: submodule-update
-	$(rbm) build release --target alpha --target browser-android-x86 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target basebrowser
basebrowser-alpha-android-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-android-x86_64 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target basebrowser
basebrowser-alpha-android-aarch64: submodule-update
-	$(rbm) build release --target alpha --target browser-android-aarch64 --target basebrowser
-
-basebrowser-alpha-desktop: submodule-update
-	$(rbm) build release --target alpha --target browser-all-desktop --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser
basebrowser-alpha-linux-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
basebrowser-alpha-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
basebrowser-alpha-linux-i686: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-i686 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target basebrowser
basebrowser-alpha-linux-aarch64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-aarch64 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
basebrowser-alpha-windows-i686: submodule-update
-	$(rbm) build release --target alpha --target browser-windows-i686 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target basebrowser
basebrowser-alpha-windows-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-windows-x86_64 --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
basebrowser-alpha-macos: submodule-update
-	$(rbm) build release --target alpha --target browser-macos --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target basebrowser
basebrowser-alpha-src: submodule-update
-	$(rbm) build release --target alpha --target browser-src --target basebrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target basebrowser
basebrowser-nightly: submodule-update
    $(rbm) build release --target nightly --target browser-all --target basebrowser
-basebrowser-nightly-android: submodule-update
-	$(rbm) build release --target nightly --target browser-all-android --target basebrowser
-
 basebrowser-nightly-android-armv7: submodule-update
-	$(rbm) build release --target nightly --target browser-android-armv7 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target basebrowser
basebrowser-nightly-android-x86: submodule-update
-	$(rbm) build release --target nightly --target browser-android-x86 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target basebrowser
basebrowser-nightly-android-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-android-x86_64 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target basebrowser
basebrowser-nightly-android-aarch64: submodule-update
-	$(rbm) build release --target nightly --target browser-android-aarch64 --target basebrowser
-
-basebrowser-nightly-desktop: submodule-update
-	$(rbm) build release --target nightly --target browser-all-desktop --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser
basebrowser-nightly-linux-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
basebrowser-nightly-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
basebrowser-nightly-linux-i686: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-i686 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target basebrowser
basebrowser-nightly-linux-aarch64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-aarch64 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
basebrowser-nightly-windows-i686: submodule-update
-	$(rbm) build release --target nightly --target browser-windows-i686 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target basebrowser
basebrowser-nightly-windows-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-windows-x86_64 --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
basebrowser-nightly-macos: submodule-update
-	$(rbm) build release --target nightly --target browser-macos --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target basebrowser
basebrowser-nightly-src: submodule-update
-	$(rbm) build release --target nightly --target browser-src --target basebrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target basebrowser
basebrowser-testbuild: submodule-update
    $(rbm) build release --target testbuild --target browser-all --target basebrowser
-basebrowser-testbuild-android: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-android --target basebrowser
-
 basebrowser-testbuild-android-armv7: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-armv7 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target basebrowser
basebrowser-testbuild-android-x86: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-x86 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target basebrowser
basebrowser-testbuild-android-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-x86_64 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target basebrowser
basebrowser-testbuild-android-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-android-aarch64 --target basebrowser
-
-basebrowser-testbuild-desktop: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-desktop --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser
basebrowser-testbuild-linux-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
basebrowser-testbuild-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
basebrowser-testbuild-linux-i686: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-i686 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target basebrowser
basebrowser-testbuild-linux-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-aarch64 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
basebrowser-testbuild-windows-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
basebrowser-testbuild-windows-i686: submodule-update
-	$(rbm) build release --target testbuild --target browser-windows-i686 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-i686 --target basebrowser
basebrowser-testbuild-macos: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target basebrowser
basebrowser-testbuild-macos-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target basebrowser
basebrowser-testbuild-macos-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target basebrowser
basebrowser-testbuild-src: submodule-update
-	$(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target basebrowser
basebrowser-incrementals-nightly: submodule-update
    $(rbm) build release --step update_responses_config --target nightly --target basebrowser
@@ -452,107 +412,101 @@ basebrowser-incrementals-nightly: submodule-update
 # Mullvad Browser Targets #
 ###########################
-mullvadbrowser-release: submodule-update
-	$(rbm) build release --target release --target browser-all-desktop --target mullvadbrowser
+mullvadbrowser: submodule-update
+	@echo Building mullvadbrowser-$(browser_default_channel)
+	$(MAKE) mullvadbrowser-$(browser_default_channel)
+	@echo Building incrementals for mullvadbrowser-$(browser_default_channel)
+	$(MAKE) mullvadbrowser-incrementals-$(browser_default_channel)
-mullvadbrowser-release-desktop: submodule-update
-	$(rbm) build release --target release --target browser-all-desktop --target mullvadbrowser
+mullvadbrowser-release: submodule-update
+	$(rbm) build release --target release --target browser-all --target mullvadbrowser
mullvadbrowser-release-linux-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64 --target mullvadbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
mullvadbrowser-release-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64-asan --target mullvadbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
mullvadbrowser-release-linux-aarch64: submodule-update
-	$(rbm) build release --target release --target browser-linux-aarch64 --target mullvadbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
mullvadbrowser-release-windows-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-windows-x86_64 --target mullvadbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
mullvadbrowser-release-macos: submodule-update
-	$(rbm) build release --target release --target browser-macos --target mullvadbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target mullvadbrowser
mullvadbrowser-release-src: submodule-update
-	$(rbm) build release --target release --target browser-src --target mullvadbrowser
+	$(rbm) build release --target release --target browser-single-platform --target browser-src --target mullvadbrowser
mullvadbrowser-alpha: submodule-update
-	$(rbm) build release --target alpha --target browser-all-desktop --target mullvadbrowser
-
-mullvadbrowser-alpha-desktop: submodule-update
-	$(rbm) build release --target alpha --target browser-all-desktop --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-all --target mullvadbrowser
mullvadbrowser-alpha-linux-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64 --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
mullvadbrowser-alpha-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
mullvadbrowser-alpha-linux-aarch64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-aarch64 --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
mullvadbrowser-alpha-windows-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-windows-x86_64 --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
mullvadbrowser-alpha-macos: submodule-update
-	$(rbm) build release --target alpha --target browser-macos --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target mullvadbrowser
mullvadbrowser-alpha-src: submodule-update
-	$(rbm) build release --target alpha --target browser-src --target mullvadbrowser
+	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target mullvadbrowser
mullvadbrowser-nightly: submodule-update
-	$(rbm) build release --target nightly --target browser-all-desktop --target mullvadbrowser
-
-mullvadbrowser-nightly-desktop: submodule-update
-	$(rbm) build release --target nightly --target browser-all-desktop --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-all --target mullvadbrowser
mullvadbrowser-nightly-linux-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64 --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
mullvadbrowser-nightly-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
mullvadbrowser-nightly-linux-aarch64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-aarch64 --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
mullvadbrowser-nightly-windows-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-windows-x86_64 --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
mullvadbrowser-nightly-macos: submodule-update
-	$(rbm) build release --target nightly --target browser-macos --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target mullvadbrowser
mullvadbrowser-nightly-src: submodule-update
-	$(rbm) build release --target nightly --target browser-src --target mullvadbrowser
+	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target mullvadbrowser
mullvadbrowser-testbuild: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-desktop --target mullvadbrowser
-
-mullvadbrowser-testbuild-desktop: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-desktop --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-all --target mullvadbrowser
mullvadbrowser-testbuild-linux-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
mullvadbrowser-testbuild-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
mullvadbrowser-testbuild-linux-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-aarch64 --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
mullvadbrowser-testbuild-windows-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
mullvadbrowser-testbuild-macos: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target mullvadbrowser
mullvadbrowser-testbuild-macos-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target mullvadbrowser
mullvadbrowser-testbuild-macos-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target mullvadbrowser
mullvadbrowser-testbuild-src: submodule-update
-	$(rbm) build release --target testbuild --target browser-src-testbuild --target mullvadbrowser
+	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target mullvadbrowser
mullvadbrowser-incrementals-release: submodule-update
    $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
@@ -701,7 +655,7 @@ cargo_vendor-rcodesign: submodule-update
 ##################
submodule-update:
-	git submodule update --init
+	@git submodule update --init
# requires tpo_user variable be set in rbm.local.conf
 torbrowser-upload-sha256sums-release: submodule-update
=====================================
projects/release/build
=====================================
@@ -4,40 +4,40 @@
 [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
 destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"
 mkdir -p "$destdir"
-[% IF c("var/browser-android-armv7") -%]
+[% IF c("var/browser_platforms/android-armv7") -%]
   mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-android-x86") -%]
+[% IF c("var/browser_platforms/android-x86") -%]
   mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-android-x86_64") -%]
+[% IF c("var/browser_platforms/android-x86_64") -%]
   mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-android-aarch64") -%]
+[% IF c("var/browser_platforms/android-aarch64") -%]
   mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-windows-i686") -%]
+[% IF c("var/browser_platforms/windows-i686") -%]
   mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-windows-x86_64") -%]
+[% IF c("var/browser_platforms/windows-x86_64") -%]
   mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-macos") -%]
+[% IF c("var/browser_platforms/macos") -%]
   mv [% c('input_files_by_name/macos') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-macos-x86_64") -%]
+[% IF c("var/browser_platforms/macos-x86_64") -%]
   mv [% c('input_files_by_name/macos-x86_64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-macos-aarch64") -%]
+[% IF c("var/browser_platforms/macos-aarch64") -%]
   mv [% c('input_files_by_name/macos-aarch64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-linux-i686") -%]
+[% IF c("var/browser_platforms/linux-i686") -%]
   mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-linux-x86_64") -%]
+[% IF c("var/browser_platforms/linux-x86_64") -%]
   mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
 [% END -%]
-[% IF c("var/browser-linux-aarch64") -%]
+[% IF c("var/browser_platforms/linux-aarch64") -%]
   mv [% c('input_files_by_name/linux-aarch64') %]/* "$destdir"/
 [% END -%]
 [% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%]
=====================================
projects/release/config
=====================================
@@ -10,75 +10,69 @@ var:
targets:
   browser-all:
-    - browser-linux-x86_64
-    - browser-linux-i686
-    - browser-linux-aarch64
-    - browser-windows-i686
-    - browser-windows-x86_64
-    - browser-macos
-    - browser-android-armv7
-    - browser-android-x86
-    - browser-android-x86_64
-    - browser-android-aarch64
     - browser-src
     - browser-all-target
-  browser-all-desktop:
-    - browser-linux-x86_64
-    - browser-linux-i686
-    - browser-linux-aarch64
-    - browser-windows-i686
-    - browser-windows-x86_64
-    - browser-macos
-    - browser-src
-    - browser-all-target
-  browser-all-android:
-    - browser-android-armv7
-    - browser-android-x86
-    - browser-android-x86_64
-    - browser-android-aarch64
+  browser-single-platform:
+    var:
+      browser_platforms:
+        is_android_release: 0
+        is_desktop_release: 0
   browser-android-armv7:
     var:
-      browser-android-armv7: 1
+      browser_platforms:
+        android-armv7: 1
   browser-android-x86:
     var:
-      browser-android-x86: 1
+      browser_platforms:
+        android-x86: 1
   browser-android-x86_64:
     var:
-      browser-android-x86_64: 1
+      browser_platforms:
+        android-x86_64: 1
   browser-android-aarch64:
     var:
-      browser-android-aarch64: 1
+      browser_platforms:
+        android-aarch64: 1
   browser-linux-x86_64:
     var:
-      browser-linux-x86_64: 1
+      browser_platforms:
+        linux-x86_64: 1
       linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'
   browser-linux-x86_64-asan:
     var:
-      browser-linux-x86_64: 1
+      browser_platforms:
+        linux-x86_64: 1
       asan-build: '-asan'
   browser-linux-i686:
     var:
-      browser-linux-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
+      browser_platforms:
+        linux-i686: 1
       linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'
   browser-linux-aarch64:
     var:
-      browser-linux-aarch64: '[% ! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly") %]'
+      browser_platforms:
+        linux-aarch64: 1
       linux-packages-aarch64: '[% (! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly")) && (c("var/mullvad-browser") || c("var/tor-browser-linux-packages")) %]'
   browser-windows-i686:
     var:
-      browser-windows-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
+      browser_platforms:
+        windows-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
   browser-windows-x86_64:
     var:
-      browser-windows-x86_64: 1
+      browser_platforms:
+        windows-x86_64: 1
   browser-macos:
     var:
-      browser-macos: 1
+      browser_platforms:
+        macos: 1
   browser-macos-x86_64:
     var:
-      browser-macos-x86_64: 1
+      browser_platforms:
+        macos-x86_64: 1
   browser-macos-aarch64:
     var:
-      browser-macos-aarch64: 1
+      browser_platforms:
+        macos-aarch64: 1
   browser-src:
     var:
       browser-src: '[% ! c("var/testbuild") %]'
@@ -93,8 +87,6 @@ targets:
     - torbrowser
     - release
     - browser-all
-    - browser-all-android
-    - browser-all-desktop
noversiondir:
     var:
@@ -156,7 +148,7 @@ input_files:
 # Release
   - name: android-armv7
     project: browser
-    enable: '[% c("var/browser-android-armv7") %]'
+    enable: '[% c("var/browser_platforms/android-armv7") %]'
     target:
       - '[% c("var/containers_target") %]'
       - '[% c("var/build_target") %]'
@@ -164,7 +156,7 @@ input_files:
- name: android-x86
     project: browser
-    enable: '[% c("var/browser-android-x86") %]'
+    enable: '[% c("var/browser_platforms/android-x86") %]'
     target:
       - '[% c("var/containers_target") %]'
       - '[% c("var/build_target") %]'
@@ -172,7 +164,7 @@ input_files:
- name: android-x86_64
     project: browser
-    enable: '[% c("var/browser-android-x86_64") %]'
+    enable: '[% c("var/browser_platforms/android-x86_64") %]'
     target:
       - '[% c("var/containers_target") %]'
       - '[% c("var/build_target") %]'
@@ -180,7 +172,7 @@ input_files:
- name: android-aarch64
     project: browser
-    enable: '[% c("var/browser-android-aarch64") %]'
+    enable: '[% c("var/browser_platforms/android-aarch64") %]'
     target:
       - '[% c("var/containers_target") %]'
       - '[% c("var/build_target") %]'
@@ -188,28 +180,28 @@ input_files:
- name: linux-x86_64
     project: browser
-    enable: '[% c("var/browser-linux-x86_64") %]'
+    enable: '[% c("var/browser_platforms/linux-x86_64") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]'
- name: linux-i686
     project: browser
-    enable: '[% c("var/browser-linux-i686") %]'
+    enable: '[% c("var/browser_platforms/linux-i686") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-linux-i686'
- name: linux-aarch64
     project: browser
-    enable: '[% c("var/browser-linux-aarch64") %]'
+    enable: '[% c("var/browser_platforms/linux-aarch64") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-linux-aarch64'
- name: deb-packages
     project: linux-packages
-    enable: '[% c("var/linux-packages") %]'
+    enable: '[% c("var/browser_platforms/packages") %]'
     # Add $browser_type-linux-x86_64 target for container config
     target:
       - '[% IF c("var/testbuild") %]testbuild[% END %]'
@@ -247,21 +239,21 @@ input_files:
- name: windows-i686
     project: browser
-    enable: '[% c("var/browser-windows-i686") %]'
+    enable: '[% c("var/browser_platforms/windows-i686") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-windows-i686'
- name: windows-x86_64
     project: browser
-    enable: '[% c("var/browser-windows-x86_64") %]'
+    enable: '[% c("var/browser_platforms/windows-x86_64") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-windows-x86_64'
- name: macos
     project: browser
-    enable: '[% c("var/browser-macos") %]'
+    enable: '[% c("var/browser_platforms/macos") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-macos'
@@ -269,7 +261,7 @@ input_files:
  # non-universal macos build
   - name: macos-x86_64
     project: browser
-    enable: '[% c("var/browser-macos-x86_64") %]'
+    enable: '[% c("var/browser_platforms/macos-x86_64") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-macos-x86_64'
@@ -277,7 +269,7 @@ input_files:
  # non-universal macos build
   - name: macos-aarch64
     project: browser
-    enable: '[% c("var/browser-macos-aarch64") %]'
+    enable: '[% c("var/browser_platforms/macos-aarch64") %]'
     target:
       - '[% c("var/build_target") %]'
       - '[% c("var/browser_type") %]-macos-aarch64'
=====================================
rbm.conf
=====================================
@@ -79,6 +79,20 @@ var:
   # to be reproducible, browser_release_date should always be in the past.
   browser_release_date: '2025/02/10 18:18:25'
   browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
+  browser_default_channel: alpha
+  browser_platforms:
+    is_android_release: '[% c("var/tor-browser") %]'
+    is_desktop_release: '1'
+    android-armv7: '[% c("var/browser_platforms/is_android_release") %]'
+    android-x86: '[% c("var/browser_platforms/is_android_release") %]'
+    android-x86_64: '[% c("var/browser_platforms/is_android_release") %]'
+    android-aarch64: '[% c("var/browser_platforms/is_android_release") %]'
+    linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
+    linux-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]'
+    linux-aarch64: '[% c("var/browser_platforms/is_desktop_release") && ( c("var/testbuild") || c("var/nightly") ) %]'
+    windows-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]'
+    windows-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
+    macos: '[% c("var/browser_platforms/is_desktop_release") %]'
   updater_enabled: 1
   build_mar: 1
   torbrowser_incremental_from:
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/3...
-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/3...
You're receiving this email because of your account on gitlab.torproject.org.





    