diff options
| author | Albin <albin@mullvad.net> | 2023-03-15 10:21:48 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-15 10:21:48 +0100 |
| commit | c89b9078a8830ee639a22ba3b365644abc7ecd45 (patch) | |
| tree | 1b498e65a1374164e62da81e4b41caf59d7681cf /.github/workflows/android-app.yml | |
| parent | 8382174aaa99d126f38a31180beaa1123e62dcc5 (diff) | |
| parent | 8655b1be493a866e936d909baeb455e7103aaa9a (diff) | |
| download | mullvadvpn-c89b9078a8830ee639a22ba3b365644abc7ecd45.tar.xz mullvadvpn-c89b9078a8830ee639a22ba3b365644abc7ecd45.zip | |
Merge branch 'bump-android-container-image-droid-30'
Diffstat (limited to '.github/workflows/android-app.yml')
| -rw-r--r-- | .github/workflows/android-app.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 0bda8348f3..89ff920d26 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -66,6 +66,7 @@ jobs: id: native-lib-cache-hash shell: bash run: | + git config --global --add safe.directory $(pwd) non_android_hash="$(git grep --cached -l '' -- ':!android/' \ | xargs -d '\n' sha1sum \ | sha1sum \ @@ -92,7 +93,7 @@ jobs: ARCHITECTURES="$ABI" UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/$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" + NDK_TOOLCHAIN_STRIP_TOOL="$NDK_TOOLCHAIN_DIR/llvm-strip" ./wireguard/build-wireguard-go.sh --android --no-docker cargo build --target $TARGET --verbose --package mullvad-jni --features api-override cargo run --bin relay_list > build/relays.json |