commit 8f6f2753f3efcd088a4dc28b884d11b96cdc1353 Author: Nicolas Vigier boklm@torproject.org Date: Thu Feb 24 10:50:44 2022 +0100

Bug 40438: Use the same list of bridges for desktop and android --- projects/tor-android-service/build | 4 ++++ projects/tor-android-service/config | 3 +++ 2 files changed, 7 insertions(+)

diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index cee92c2..4ac5989 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -25,6 +25,10 @@ rm -fR service/src/main/jniLibs/* rm service/libs/* cp $rootdir/[% c('input_files_by_name/topl') %]/*{.aar,.jar} service/libs/

+# Update bridges list +cat $rootdir/bridges_list.obfs4.txt $rootdir/bridges_list.meek-azure.txt \ + $rootdir/bridges_list.snowflake.txt > service/src/main/assets/common/bridges.txt + # Build Android Libraries and Apps gradle --offline --no-daemon -P androidplugin=3.6.0 -P appcompatVersion=28.0.0 -P compileVersion=29 -P targetVersion=29 -P minVersion=16 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint

diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index fd92cc7..3884ef5 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -45,3 +45,6 @@ input_files: - URL: 'https://dl.google.com/dl/android/studio/jetifier-zips/1.0.0-beta10/jetifier-...' name: jetifier sha256sum: 38186db9c9d1b745890b3d35c0667da1cac146ceb3c26aae5bf0802119472c1b + - filename: bridges_list.obfs4.txt + - filename: bridges_list.meek-azure.txt + - filename: bridges_list.snowflake.txt