Skip to content

Commit fca422d

Browse files
committedSep 6, 2024
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.
1 parent 5367c56 commit fca422d

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed
 

‎.github/workflows/android-app.yml

+2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ jobs:
206206
RUSTFLAGS: --deny warnings
207207
BUILD_TYPE: debug
208208
run: |
209+
# Temporary fix to address maybenot.h build issues.
210+
cargo install --force cbindgen --version "0.26.0"
209211
ARCHITECTURES="${{ matrix.abi }}"
210212
UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so"
211213
STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so"

‎build-apk.sh

+8
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@ mkdir -p "app/build/extraAssets"
7777
mkdir -p "app/build/extraJni"
7878
popd
7979

80+
# Temporary fix to address maybenot.h (checked in) sometimes needing to be
81+
# re-generated due to how `make` looks at last-modifications while git neither
82+
# stores nor consistently sets modification metadata on file checkout.
83+
#
84+
# NOTE: The version should match the one used in the checked in
85+
# maybenot.h file.
86+
cargo install --force cbindgen --version "0.26.0"
87+
8088
for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
8189
case "$ARCHITECTURE" in
8290
"x86_64")

0 commit comments

Comments
 (0)
Failed to load comments.