diff options
| author | Albin <albin@mullvad.net> | 2022-01-31 13:59:47 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-02-01 14:38:28 +0100 |
| commit | 1756b47ae9c75492de70cebf676b9c5fa280f90f (patch) | |
| tree | ccda977436009b20ab51b48a2ab1ed14b00ebde3 /.github | |
| parent | f5dd69be7de592c86b83dd01370f19e4d7ba5651 (diff) | |
| download | mullvadvpn-1756b47ae9c75492de70cebf676b9c5fa280f90f.tar.xz mullvadvpn-1756b47ae9c75492de70cebf676b9c5fa280f90f.zip | |
Fix incomplete Android builds in GH actions
Fixes:
* Missing inclusion of libmullvad_jni.so
* Missing relays.json
* Missing api-ip-address.txt
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android-app.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 28d5ff0e87..0d8f9fc04e 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -87,11 +87,20 @@ jobs: NDK_TOOLCHAIN_DIR: ${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin AR_x86_64_linux_android: ${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar CC_x86_64_linux_android: ${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang - ARCHITECTURES: aarch64 x86_64 + ARCHITECTURES: x86_64 + TARGET: "x86_64-linux-android" + BUILD_TYPE: debug run: | + ABI="$ARCHITECTURES" + UNSTRIPPED_LIB_PATH="./target/$TARGET/$BUILD_TYPE/libmullvad_jni.so" + STRIPPED_LIB_PATH="./android/app/build/extraJni/$ABI/libmullvad_jni.so" + NDK_TOOLCHAIN_STRIP_TOOL="$NDK_TOOLCHAIN_DIR/x86_64-linux-android-strip" ./wireguard/build-wireguard-go.sh --android --no-docker - source env.sh x86_64-linux-android - cargo build --target x86_64-linux-android --verbose --package mullvad-jni + source env.sh $TARGET + cargo build --target $TARGET --verbose --package mullvad-jni + cargo run --bin relay_list > dist-assets/relays.json + cargo run --bin address_cache > dist-assets/api-ip-address.txt + $NDK_TOOLCHAIN_STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH" cd android ./gradlew --console plain assembleDebug ./gradlew testDebugUnitTest |