From c5d3ffe0d7d64b477eceaa8c6770a2ea14af0fc6 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 15 Jun 2022 14:32:03 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20CI=C2=A0for=20android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf2f82a58..668a55195 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,11 +63,11 @@ jobs: - name: android_arm target: android_arm image_variant: bionic - lib_postfix: '/x86_64-linux-gnu' + lib_postfix: '/arm-linux-androideabi' - name: android_arm64 target: android_arm64 image_variant: bionic - lib_postfix: '/x86_64-linux-gnu' + lib_postfix: '/aarch64-linux-android' - name: win32_static target: win32_static image_variant: f35 @@ -118,7 +118,7 @@ jobs: MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt" fi if [[ "${{matrix.target}}" =~ android_.* ]]; then - MESON_OPTION="$MESON_OPTION -Dandroid=true" + MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true" fi cd $HOME/libkiwix meson . build ${MESON_OPTION}