From 7a01cc320cbad959b46400061c3787d5f5917e8a Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 24 Sep 2024 10:25:19 +1200 Subject: [PATCH] [ci] Make android-cross job build shared again This seems to work if we specify: ANDROID_NDK: '/usr/local/lib/android/sdk/ndk/26.3.11579264' host_triplet: 'armv7a-linux-androideabi34' --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3e22bef7..dad97775f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1517,7 +1517,11 @@ jobs: android-cross: runs-on: 'ubuntu-22.04' env: - host_triplet: 'armv7a-linux-androideabi35' + # Override github default because 27.1.12297006 fails with link errors in + # a shared build, such as: + # ld.lld: error: non-exported symbol '__aeabi_uidivmod' in '/usr/local/lib/android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-arm-android.a(aeabi_uidivmod.S.o)' is referenced by DSO './.libs/libxapian-1.5.so' + ANDROID_NDK: '/usr/local/lib/android/sdk/ndk/26.3.11579264' + host_triplet: 'armv7a-linux-androideabi34' needs: makedist steps: - name: Install CCache @@ -1537,12 +1541,8 @@ jobs: run: | PATH=$PATH:$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin cd xapian-core - # A shared build used to work with NDK 25.2.9519653 but fails with - # 26.3.11579264 and 27.1.12297006 with link errors like: - # ld.lld: error: non-exported symbol '__aeabi_uidivmod' in '/usr/local/lib/android/sdk/ndk/27.1.12297006/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/18/lib/linux/libclang_rt.builtins-arm-android.a(aeabi_uidivmod.S.o)' is referenced by DSO './.libs/libxapian-1.5.so' ./configure --enable-werror \ --host=$host_triplet \ - --disable-shared --enable-static \ CC="ccache ${host_triplet}-clang" \ CXX="ccache ${host_triplet}-clang++" \ PKG_CONFIG=/bin/false -- 2.11.4.GIT