[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40918: Add the commit hash also when merging AARs.

[richard (@richard)]

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


Commits:
a7137058 by Pier Angelo Vendrame at 2023-08-10T17:24:57+00:00
Bug 40918: Add the commit hash also when merging AARs.

We added the commit hashes to GeckoView. However, we might have tested
it only with the single-arch testbuilds, because it is not displayed in
regular builds.
Adding the information also to the mozconfig-android-all makes the
commit link available also on them.

- - - - -


2 changed files:

- projects/geckoview/build
- projects/geckoview/merge_aars


Changes:

=====================================
projects/geckoview/build
=====================================
@@ -80,6 +80,9 @@ mkdir "$HOME/.mozbuild"
   cat >> mozconfig-android-all << 'MOZCONFIG_EOF'
 ac_add_options --enable-update-channel=[% c("var/channel") %]
 ac_add_options --with-base-browser-version=[% c("var/torbrowser_version") %]
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]"
+export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %]
 MOZCONFIG_EOF
 
   pushd tools/torbrowser


=====================================
projects/geckoview/merge_aars
=====================================
@@ -27,7 +27,12 @@ export MOZ_ANDROID_FAT_AAR_X86_64=$builddir/geckoview/*x86_64*.aar
 
 cd $builddir/[% project %]-[% c("version") %]
 ln -s mozconfig-android-all .mozconfig
-echo 'mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]' >> .mozconfig
+cat >> mozconfig-android-all << 'MOZCONFIG_EOF'
+mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]"
+export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %]
+MOZCONFIG_EOF
 
 [% c("var/set_MOZ_BUILD_DATE") %]
 



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a713705887153dc3131eaed029d33847f5bb4c4c
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230810/e8515598/attachment-0001.htm>