The Android license file is not deterministic anymore
I built TBA out of Dan's MR from 096681b3 + with this config
Click to expand
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 28552a37..e40b20c3 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,9 +1,10 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
-git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]'
-tag_gpg_id: 1
-git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git
+# git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]'
+# tag_gpg_id: 1
+git_url: https://gitlab.torproject.org/dan/tor-browser.git
+git_hash: 3b34ffba3855df6cc00c691d9a1664e31a1b787c
gpg_keyring:
- boklm.gpg
- dan_b.gpg
diff --git a/rbm.conf b/rbm.conf
index fdaf9b63..31f54d19 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -74,7 +74,7 @@ buildconf:
var:
torbrowser_version: '14.0a1'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build1001'
# This should be the date of when the build is started. For the build
# to be reproducible, browser_release_date should always be in the past.
browser_release_date: '2024/07/24 21:00:00'These are the builds:
- https://tb-build-03.torproject.org/~pierov/torbrowser/alpha/unsigned/14.0a1-build1001/ (built on tb-build-03)
- https://tb-build-03.torproject.org/~pierov/torbrowser/alpha/unsigned/14.0a1-build1001-pierov/ (built on my machine)
They almost match, except for license files (res/raw/third_party_licenses, res/raw/third_party_license_metadata, you can get these names with apktool d, otherwise you get names such as res/7Y, res/Hz).
I wrote a more detailed description in the original MR for the toolchain update.
/cc @clairehurst @dan @morgan