Commit a7137058 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by richard
Browse files

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.
parent 15afa277

projects/geckoview/build

+3 −0
Original line number Diff line number Diff line
@@ -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

+6 −1
Original line number Diff line number Diff line
@@ -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") %]