ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: f4227713 by Pier Angelo Vendrame at 2023-06-07T19:10:03+02:00 Bug 40874: Include the commit information in GeckoView

Add the commit hash and GitLab URL to the mozconfig to make them appear in about:buildconfig on Android, too.

- - - - -

2 changed files:

- projects/geckoview/build - projects/geckoview/config

Changes:

===================================== projects/geckoview/build ===================================== @@ -41,7 +41,13 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

cd /var/tmp/build/[% project %]-[% c("version") %] -ln -s mozconfig-[% c("var/osname") %] .mozconfig +cat > .mozconfig << 'MOZCONFIG_EOF' +. $topsrcdir/mozconfig-[% c("var/osname") %] + +export MOZ_INCLUDE_SOURCE_INFO=1 +export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" +export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] +MOZCONFIG_EOF

eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ]

===================================== projects/geckoview/config ===================================== @@ -15,6 +15,8 @@ var: browser_branch: 12.5-1 browser_build: 3 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' + gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser + git_commit: '[% exec("git rev-parse HEAD") %]' deps: - build-essential - unzip

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f4...