diff options
| author | Albin <albin@mullvad.net> | 2024-09-05 23:58:31 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-09-06 14:59:55 +0200 |
| commit | fca422d5f58e66ad8fc364b2ae3d393d3c9ec5e3 (patch) | |
| tree | e5b0efdd66bdc77ee6b4ff16d3a23db854f5a213 | |
| parent | 5367c566e3e1928f423b02abd99ea1368348c48a (diff) | |
| download | mullvadvpn-fca422d5f58e66ad8fc364b2ae3d393d3c9ec5e3.tar.xz mullvadvpn-fca422d5f58e66ad8fc364b2ae3d393d3c9ec5e3.zip | |
Install cbindgen in build script and workflow
Temporary fix to address maybenot.h (checked in) sometimes needing to
be re-generated due to how `make` looks at last-modifications while
git neither stores nor consistently sets modification metadata on
file checkout.
NOTE: The version should match the one used in the checked in
maybenot.h file.
| -rw-r--r-- | .github/workflows/android-app.yml | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 204b84ed5a..b098d346f7 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -206,6 +206,8 @@ jobs: RUSTFLAGS: --deny warnings BUILD_TYPE: debug run: | + # Temporary fix to address maybenot.h build issues. + cargo install --force cbindgen --version "0.26.0" ARCHITECTURES="${{ matrix.abi }}" UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so" STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so" diff --git a/build-apk.sh b/build-apk.sh index e45d4014c9..748baa0946 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -77,6 +77,14 @@ mkdir -p "app/build/extraAssets" mkdir -p "app/build/extraJni" popd +# Temporary fix to address maybenot.h (checked in) sometimes needing to be +# re-generated due to how `make` looks at last-modifications while git neither +# stores nor consistently sets modification metadata on file checkout. +# +# NOTE: The version should match the one used in the checked in +# maybenot.h file. +cargo install --force cbindgen --version "0.26.0" + for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do case "$ARCHITECTURE" in "x86_64") |