This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch main in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push: new 6a5e0b31 Bug 40651: Fix Gradle not found in GV/merge_aars 6a5e0b31 is described below

commit 6a5e0b31dd9121df86955f2c9e0a49e75a31e241 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Oct 20 09:59:39 2022 +0200

Bug 40651: Fix Gradle not found in GV/merge_aars

Geckoview builds were failing because the merge_aars phase was missing Gradle. Since #40640 we are passing gradle as an argument while setting the compiler up, but the merge_aars phase was missing it. --- projects/geckoview/config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/geckoview/config b/projects/geckoview/config index 9862fc6e..ac625a15 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -35,7 +35,10 @@ steps: merge_aars: | #!/bin/bash [% c("var/set_default_env") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + [% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] distdir=/var/tmp/dist builddir=/var/tmp/build mkdir -p /var/tmp/build