[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

Title: GitLab

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:

Changes:

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

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits