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:

   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

 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") %]