commit 666785d9d539a23873f924986026a02fb32154a8 Author: Georg Koppen gk@torproject.org Date: Thu Oct 22 17:17:37 2020 +0000

Bug 40134: Support release train in android-components --- projects/android-components/build | 12 ++++++++---- projects/android-components/config | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/android-components/build b/projects/android-components/build index ace9455..622da23 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -54,9 +54,14 @@ patch -p1 < $rootdir/git.patch fi

# We want to make sure only our code is built. Overwrite engine-gecko code we - # don't need. XXX: Take release into account. + # don't need. cd components/browser - [% IF c("var/alpha") || c("var/nightly") %] + [% IF c("var/release") %] + rm -rf engine-gecko-beta/src/* + rm -rf engine-gecko-nightly/src/* + cp -rf engine-gecko/src/* engine-gecko-beta/src/ + cp -rf engine-gecko/src/* engine-gecko-nightly/src/ + [% ELSE %] rm -rf engine-gecko/src/* rm -rf engine-gecko-nightly/src/* cp -rf engine-gecko-beta/src/* engine-gecko/src/ @@ -65,8 +70,7 @@ patch -p1 < $rootdir/git.patch cd ../../ gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"

- # XXX: Take release into account - gradle $gradle_args assembleGeckoBeta -x lint + gradle $gradle_args assembleGecko[% c('variant') %] -x lint gradle $gradle_args publish

# We only need the archives and .pom files for now. diff --git a/projects/android-components/config b/projects/android-components/config index adf0e11..b715d2e 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -5,6 +5,7 @@ git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/tor git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg +variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'

var: android_components_version: 60.0.5