commit c990f8aa0c67850bec8838dfaf4fc50ec5e884cc Author: Georg Koppen gk@torproject.org Date: Mon Oct 5 08:24:55 2020 +0000

Bug 40108: Package tooling-glean-gradle archive, too --- projects/android-components/build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/android-components/build b/projects/android-components/build index acd920f..035ae48 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -60,10 +60,13 @@ patch -p1 < $rootdir/40085.patch gradle $gradle_args assembleGeckoBeta -x lint gradle $gradle_args publish

- find components -regex '.*[0-9].(aar|pom)' -exec cp --parents {} $distdir ; + # We only need the archives and .pom files for now. + find components -regex '.*[% c('var/android_components_version') %].(aar|jar|pom)' -exec cp --parents {} $distdir ;

# Package cd $distdir + # Package just the maven directory structure for easier replacement of + # Mozilla's android-components. find components -type d -name maven -exec cp -rf {} [% project %] ; [% c('tar', { tar_src => [ project ],