Merge pull request #6463 from BOINC/vko_fix_vcpkg_android_build

[ci][android] build vcpkg test on r23c and r27c NDKs

Author: AenBleidd

.github/workflows/vcpkg_test.yml

@@ -59,6 +59,7 @@ jobs:
       strategy:
         matrix:
           triplet: [ 'arm-android', 'arm-neon-android', 'arm64-android', 'x64-android', 'x86-android' ]
+          ndk: [ 'r23c', 'r27c' ]
         fail-fast: false
       steps:
         - name: Checkout
@@ -89,17 +90,17 @@ jobs:
 
         - name: Install Android NDK
           run: |
-            curl -L -o android-ndk.zip https://dl.google.com/android/repository/android-ndk-r23c-linux.zip
+            curl -L -o android-ndk.zip https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk }}-linux.zip
             unzip android-ndk.zip
 
         - name: Prepare build
           run: |
             mkdir -p tests/vcpkg/build
 
         - name: Configure arm build
-          if: ${{ matrix.triplet == 'arm-android' }}
+          if: ${{ matrix.triplet == 'arm-android' && matrix.ndk == 'r23c' }}
           run: |
-            export ANDROID_NDK_HOME=$(pwd)/android-ndk-r23c
+            export ANDROID_NDK_HOME=$(pwd)/android-ndk-${{ matrix.ndk }}
             echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
             toolchain_root="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64"
             tc_binaries="${toolchain_root}/bin"
@@ -119,7 +120,7 @@ jobs:
         - name: Configure arm-neon build
           if: ${{ matrix.triplet == 'arm-neon-android' }}
           run: |
-            export ANDROID_NDK_HOME="$(pwd)/android-ndk-r23c"
+            export ANDROID_NDK_HOME="$(pwd)/android-ndk-${{ matrix.ndk }}"
             echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
             toolchain_root="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64"
             tc_binaries="${toolchain_root}/bin"
@@ -139,7 +140,7 @@ jobs:
         - name: Configure arm64 build
           if: ${{ matrix.triplet == 'arm64-android' }}
           run: |
-            export ANDROID_NDK_HOME="$(pwd)/android-ndk-r23c"
+            export ANDROID_NDK_HOME="$(pwd)/android-ndk-${{ matrix.ndk }}"
             echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
             toolchain_root="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64"
             tc_binaries="${toolchain_root}/bin"
@@ -159,7 +160,7 @@ jobs:
         - name: Configure x64 build
           if: ${{ matrix.triplet == 'x64-android' }}
           run: |
-            export ANDROID_NDK_HOME="$(pwd)/android-ndk-r23c"
+            export ANDROID_NDK_HOME="$(pwd)/android-ndk-${{ matrix.ndk }}"
             echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
             toolchain_root="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64"
             tc_binaries="${toolchain_root}/bin"
@@ -179,7 +180,7 @@ jobs:
         - name: Configure x86 build
           if: ${{ matrix.triplet == 'x86-android' }}
           run: |
-            export ANDROID_NDK_HOME="$(pwd)/android-ndk-r23c"
+            export ANDROID_NDK_HOME="$(pwd)/android-ndk-${{ matrix.ndk }}"
             echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
             toolchain_root="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64"
             tc_binaries="${toolchain_root}/bin"
@@ -197,14 +198,15 @@ jobs:
             cmake -E env CC="${CC}" CXX="${CXX}" LD="${LD}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" cmake -B tests/vcpkg/build -S tests/vcpkg/ -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
 
         - name: Build
+          if: ${{ matrix.triplet != 'arm-android' || (matrix.triplet == 'arm-android' && matrix.ndk == 'r23c') }}
           run: |
             cmake --build tests/vcpkg/build --config Release
 
         - name: Upload logs on failure
           if: ${{ failure() }}
           uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
           with:
-            name: vcpkg_test-logs-${{ matrix.triplet }}
+            name: vcpkg_test-logs-${{ matrix.triplet }}-${{ matrix.ndk }}
             path: vcpkg/buildtrees/**/*.log
 
     linux:

configure.ac

@@ -734,10 +734,10 @@ sse3_flags="-msse3"
 avx_flags="-mavx"
 CXXFLAGS="${save_cxxflags} ${sse3_flags}"
 CPPFLAGS="${save_cppflags} ${sse3_flags}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],)], [], [sse_flags=""])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],)], [], [sse_flags=""])
 CXXFLAGS="${save_cxxflags} ${avx_flags}"
 CPPFLAGS="${save_cppflags} ${avx_flags}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],)], [], [avx_flags=""])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],)], [], [avx_flags=""])
 CXXFLAGS="${save_cxxflags} ${sse3_flags}"
 CXXFLAGS="${save_cxxflags} ${sse3_flags}"
 AC_CHECK_HEADERS([intrin.h x86intrin.h pmmintrin.h xmmintrin.h emmintrin.h])

lib/diagnostics.cpp

@@ -42,6 +42,10 @@
 #include "mac_backtrace.h"
 #endif
 
+#if defined(ANDROID) && __ANDROID_API__ < 33
+#undef HAVE_EXECINFO_H
+#endif
+
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
 #endif