richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: bf0dfe66 by Pier Angelo Vendrame at 2023-10-11T09:51:01+02:00 Bug 40974: Fix firefox-android with the release target.

In the firefox-android project we look for the geckoview artifacts to detect its version. For alpha and nightly its directory incldues the channel, so we were looking for `geckoview-release-omni`, but for release the directory is `geckoview-omni` only.

- - - - -

1 changed file:

- projects/firefox-android/build

Changes:

===================================== projects/firefox-android/build ===================================== @@ -53,7 +53,12 @@ cd $builddir-[% c('version') %] patch -p1 < $rootdir/repos.diff sed -i 's|^(val VERSION = ).*|\1"[% c("var/as_version") %]"|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt sed -i 's|^(val CHANNEL = ).*|\1ApplicationServicesChannel.RELEASE|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt -gv_version=$(find "$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" -mindepth 1 -maxdepth 1 -type d -printf '%f\n') +[% IF c("var/channel") == "release" -%] + gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-omni" +[% ELSE -%] + gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" +[% END -%] +gv_version=$(find "$gv_dir" -mindepth 1 -maxdepth 1 -type d -printf '%f\n') sed -i "s|(\s*const val version = ).*|\1"$gv_version"|" android-components/plugins/dependencies/src/main/java/Gecko.kt sed -i 's|(\s*val channel = ).*|\1GeckoChannel.[% c("var/variant") FILTER upper %]|' android-components/plugins/dependencies/src/main/java/Gecko.kt

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/bf...