From e1af7285d1f65b452172dd44f8ae8c680fe720aa Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 24 Oct 2024 04:44:30 +0200 Subject: [PATCH] CI with android NDK r27c (#40339) Co-authored-by: Billy Robert O'Neal III --- scripts/azure-pipelines/android/Dockerfile | 8 ++--- .../android/azure-pipelines.yml | 2 +- scripts/azure-pipelines/azure-pipelines.yml | 2 +- scripts/ci.baseline.txt | 36 +++++++++++++------ scripts/test_ports/cmake-user/vcpkg.json | 2 +- scripts/test_ports/vcpkg-ci-curl/vcpkg.json | 2 +- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index b6274d9370..5ebfbf6b64 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:focal-20240918 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb -ADD https://dl.google.com/android/repository/android-ndk-r26d-linux.zip /android-ndk-r26d-linux.zip +ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip # Add apt packages @@ -60,10 +60,10 @@ apt-get -y dist-upgrade apt-get -y --no-install-recommends install $APT_PACKAGES # Android NDK -unzip /android-ndk-r26d-linux.zip -rm -f android-ndk-r26d-linux.zip +unzip /android-ndk-r27c-linux.zip +rm -f android-ndk-r27c-linux.zip END_OF_SCRIPT -ENV ANDROID_NDK_HOME /android-ndk-r26d +ENV ANDROID_NDK_HOME /android-ndk-r27c WORKDIR /vcpkg diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index 8e7f016ef9..3fdc902588 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - name: ANDROID_NDK_HOME - value: /android-ndk-r26d + value: /android-ndk-r27c steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 266a0b5335..b9215e4291 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-10-15' + linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-10-21' parameters: - name: vcpkgToolSha diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6323979153..72f47ba081 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -66,11 +66,8 @@ azure-identity-cpp:arm64-android=fail azure-identity-cpp:x64-android=fail # C++20 conformant compiler required atliac-minitest:x64-linux=fail -atliac-minitest:arm64-android=fail atliac-minitest:arm64-uwp=fail atliac-minitest:arm64-osx=fail -atliac-minitest:arm-neon-android=fail -atliac-minitest:x64-android=fail atliac-minitest:x64-osx=fail atliac-minitest:x64-uwp=fail backward-cpp:arm-neon-android=fail @@ -255,11 +252,11 @@ cppmicroservices:arm64-uwp=fail cppmicroservices:x64-android=fail cppmicroservices:x64-uwp=fail # Requires full C++20 support, currently absent from CI for these triplets. -cppslippi:arm-neon-android=fail -cppslippi:arm64-android=fail -cppslippi:x64-android=fail cppslippi:x64-linux=fail +cppcoro:arm-neon-android=fail +cppcoro:arm64-android=fail cppcoro:arm64-osx=fail +cppcoro:x64-android=fail cppcoro:x64-linux=fail cppcoro:x64-osx=fail cpputest:arm-neon-android=fail @@ -326,6 +323,12 @@ evpp:x64-android=fail fastdds:arm-neon-android=fail fastdds:arm64-android=fail fastdds:x64-android=fail +# clang rejects variable length arrays +fbgemm:x64-android=fail +# variable length arrays in C++ are a Clang extension +fbbgemmerror:arm-neon-android=fail +fbbgemmerror:arm64-android=fail +fbbgemmerror:x64-android=fail flashlight-cpu:x64-linux=fail flashlight-cuda:x64-linux=fail flint:arm-neon-android=fail @@ -353,6 +356,12 @@ fmi4cpp:arm64-uwp=fail fmi4cpp:x64-uwp=fail folly:arm64-android=fail folly:x64-android=fail +# unsupported option '-mfloat-abi=' +freerdp:arm64-android=fail +# ALooper_pollAll no longer available +freeglut:arm-neon-android=fail +freeglut:arm64-android=fail +freeglut:x64-android=fail # Needs XQuartz freeglut:x64-osx=fail freeglut:arm64-osx=fail @@ -533,6 +542,10 @@ libdc1394:x64-android=fail libdc1394:arm64-android=fail # 32-bit needs android-24 libflac:arm-neon-android=fail +# error: call to undeclared function 'mktime_z' +libgnutls:arm-neon-android=fail +libgnutls:arm64-android=fail +libgnutls:x64-android=fail # Fails to build due to incompatible delcaration of select in macOS 14.2 libgo:x64-osx=fail libgo:x64-android=fail @@ -947,6 +960,9 @@ rapidstring:x64-windows=fail rapidstring:x64-windows-static=fail rapidstring:x64-windows-static-md=fail rapidstring:x86-windows=fail +# ALooper_pollAll no longer available +raylib:arm64-android=fail +raylib:x64-android=fail # file conflicts with rbdl rbdl-orb:x86-windows=skip rbdl-orb:x64-windows=skip @@ -963,9 +979,6 @@ rbdl:x64-android=fail replxx:arm-neon-android=fail replxx:arm64-android=fail replxx:x64-android=fail -rest-rpc:arm-neon-android=fail -rest-rpc:arm64-android=fail -rest-rpc:x64-android=fail restbed:arm-neon-android=fail restbed:arm64-uwp=fail restbed:arm64-android=fail @@ -1158,9 +1171,9 @@ vulkan:arm-neon-android=fail vulkan:arm64-android=fail vulkan:x64-android=fail # Needs android-26 +vulkan-validationlayers:arm-neon-android=fail vulkan-validationlayers:arm64-android=fail vulkan-validationlayers:x64-android=fail -vulkan-validationlayers:arm-neon-android=fail wasmedge:arm-neon-android=fail wasmedge:arm64-android=fail wasmedge:x64-android=fail @@ -1188,6 +1201,9 @@ xbitmaps:arm64-android=fail xbitmaps:x64-android=fail xbitmaps:x64-osx=skip xbitmaps:arm64-osx=skip +yajl:arm-neon-android=fail +yajl:arm64-android=fail +yajl:x64-android=fail zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index a3a1bc7946..1197b1183a 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -103,7 +103,7 @@ { "$package": "GnuTLS", "name": "libgnutls", - "platform": "!windows | mingw" + "platform": "!android & (!windows | mingw)" }, { "$package": "Iconv", diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json index 8dec0bebf0..5a734b8e80 100644 --- a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json @@ -57,7 +57,7 @@ "features": [ "gnutls" ], - "platform": "!arm & !xbox" + "platform": "!arm & !android & !xbox" } ] }