Fix CI for android

This commit is contained in:
Matthieu Gautier 2022-06-15 14:32:03 +02:00
parent 3938d791e7
commit c5d3ffe0d7
1 changed files with 3 additions and 3 deletions

View File

@ -63,11 +63,11 @@ jobs:
- name: android_arm - name: android_arm
target: android_arm target: android_arm
image_variant: bionic image_variant: bionic
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/arm-linux-androideabi'
- name: android_arm64 - name: android_arm64
target: android_arm64 target: android_arm64
image_variant: bionic image_variant: bionic
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/aarch64-linux-android'
- name: win32_static - name: win32_static
target: win32_static target: win32_static
image_variant: f35 image_variant: f35
@ -118,7 +118,7 @@ jobs:
MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt" MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt"
fi fi
if [[ "${{matrix.target}}" =~ android_.* ]]; then if [[ "${{matrix.target}}" =~ android_.* ]]; then
MESON_OPTION="$MESON_OPTION -Dandroid=true" MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
fi fi
cd $HOME/libkiwix cd $HOME/libkiwix
meson . build ${MESON_OPTION} meson . build ${MESON_OPTION}