summaryrefslogtreecommitdiffhomepage
path: root/build-apk.sh
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2021-12-30 10:59:05 +0100
committerLinus Färnstrand <faern@faern.net>2021-12-30 10:59:05 +0100
commitd4d31a46fc7ef570e78499c899366f9149bd0feb (patch)
tree6bda084d0cb5787531054e2e5b34cc21ff8c25f1 /build-apk.sh
parentec76782ec5a3bab8c9036fb6b8b1239b548317c4 (diff)
downloadmullvadvpn-d4d31a46fc7ef570e78499c899366f9149bd0feb.tar.xz
mullvadvpn-d4d31a46fc7ef570e78499c899366f9149bd0feb.zip
Make build-apk.sh use cargo run directly to get relay list etc
Diffstat (limited to 'build-apk.sh')
-rwxr-xr-xbuild-apk.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build-apk.sh b/build-apk.sh
index 50cb516c6b..35c340194a 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -126,8 +126,10 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
$STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH"
done
-./update-relays.sh
-./update-api-address.sh
+echo "Updating relays.json..."
+cargo run --bin relay_list $CARGO_ARGS > dist-assets/relays.json
+echo "Updating api-ip-address..."
+cargo run --bin address_cache $CARGO_ARGS > dist-assets/api-ip-address.txt
cd "$SCRIPT_DIR/android"
$GRADLE_CMD --console plain "$GRADLE_TASK"