Skip to content

Commit

Permalink
Install cbindgen in build script and workflow
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
albin-mullvad committed Sep 6, 2024
1 parent 5367c56 commit fca422d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/android-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions build-apk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit fca422d

Please sign in to comment.