diff options
| author | Albin <albin@mullvad.net> | 2022-01-31 15:56:59 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-02-01 14:38:28 +0100 |
| commit | effe4ab7e4050879640baeb2b57f198c887d0779 (patch) | |
| tree | 76e3e2f12ef79fd5ede8a8a30656bb6d63b78e9d /.github | |
| parent | 1756b47ae9c75492de70cebf676b9c5fa280f90f (diff) | |
| download | mullvadvpn-effe4ab7e4050879640baeb2b57f198c887d0779.tar.xz mullvadvpn-effe4ab7e4050879640baeb2b57f198c887d0779.zip | |
Build Android native libs in separate step
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android-app.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 0d8f9fc04e..f72a295785 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -81,17 +81,17 @@ jobs: linker = "${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang" EOF - - name: Build and run unit tests + - name: Build native libraries env: RUSTFLAGS: --deny warnings 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: x86_64 - TARGET: "x86_64-linux-android" + ABI: x86_64 + TARGET: x86_64-linux-android BUILD_TYPE: debug run: | - ABI="$ARCHITECTURES" + ARCHITECTURES="$ABI" 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" @@ -101,6 +101,9 @@ jobs: 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" + + - name: Build and run unit tests + run: | cd android ./gradlew --console plain assembleDebug ./gradlew testDebugUnitTest |