Android: API level 28, dynamic CRT (#44424)

2026-01-18 01:11:23 +01:00 · 2025-03-20 08:19:48 +01:00
parent 6a6b135d92
commit 63932b3f1a
39 changed files with 275 additions and 136 deletions
--- a/ports/calceph/disable-gnu-source.diff
+++ b/ports/calceph/disable-gnu-source.diff
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1cb297..9448623 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -147,8 +147,10 @@ IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel")
+   MESSAGE(STATUS "Add the option '-fp-model precise' for the Intel compilers")
+   string(APPEND CMAKE_C_FLAGS " -fp-model precise ")
+ ENDIF ()
+if(NOT ANDROID)
+ # Define for the function strod_l
+ string(APPEND CMAKE_C_FLAGS " -D_GNU_SOURCE=1 ")
+endif()
+ # Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).
+ string(APPEND CMAKE_C_FLAGS " -D_LARGEFILE_SOURCE=1 ")
+ string(APPEND CMAKE_C_FLAGS " -D_LARGE_FILES=1 ")
--- a/ports/calceph/portfile.cmake
+++ b/ports/calceph/portfile.cmake
@@ -1,14 +1,14 @@
-set(CALCEPH_HASH 81cddae9fa0d06758dbbb5fae486bd64eb087dc2ebf2d7b17fa89b6689b86e0e84d1412e6852e980ebed00a4c84a3b1b4ac00b89021f6d0bb2f370a98a6dad25)
-
 vcpkg_download_distfile(ARCHIVE
    URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${VERSION}.tar.gz"
    FILENAME "calceph-${VERSION}.tar.gz"
-    SHA512 ${CALCEPH_HASH}
+    SHA512 81cddae9fa0d06758dbbb5fae486bd64eb087dc2ebf2d7b17fa89b6689b86e0e84d1412e6852e980ebed00a4c84a3b1b4ac00b89021f6d0bb2f370a98a6dad25
 )

 vcpkg_extract_source_archive(
    SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        disable-gnu-source.diff
 )

 vcpkg_cmake_configure(
@@ -28,4 +28,10 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

 file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst)
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING_CECILL_B.LIB")
+vcpkg_install_copyright(
+    COMMENT "The CALCEPH library is triple-licensed (CECILL-2.1 OR CECILL-B OR CECILL-C)."
+    FILE_LIST
+        "${SOURCE_PATH}/COPYING_CECILL_V2.1.LIB"
+        "${SOURCE_PATH}/COPYING_CECILL_B.LIB"
+        "${SOURCE_PATH}/COPYING_CECILL_C.LIB"
+)
--- a/ports/calceph/vcpkg.json
+++ b/ports/calceph/vcpkg.json
@@ -1,6 +1,7 @@
 {
  "name": "calceph",
  "version": "4.0.4",
+  "port-version": 1,
  "description": "C library to access the binary planetary ephemeris files.",
  "homepage": "https://www.imcce.fr/inpop/calceph/",
  "documentation": "https://calceph.imcce.fr/docs/latest/html/c/index.html",
--- a/ports/freexl/android-builtin-iconv.diff
+++ b/ports/freexl/android-builtin-iconv.diff
@@ -0,0 +1,39 @@
+diff --git a/src/freexl.c b/src/freexl.c
+index f73021d..cc76d63 100644
+--- a/src/freexl.c
+++ b/src/freexl.c
+@@ -61,7 +61,7 @@ extern const char *locale_charset (void);
+ #include <localcharset.h>
+ #endif /* end localcharset */
+ #else /* not WINDOWS */
+-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28)
+ #include <iconv.h>
+ #include <localcharset.h>
+ #else /* neither Mac OsX nor Android */
+diff --git a/src/freexl_ods.c b/src/freexl_ods.c
+index 07265eb..ec29b51 100644
+--- a/src/freexl_ods.c
+++ b/src/freexl_ods.c
+@@ -61,7 +61,7 @@ extern const char *locale_charset (void);
+ #include <localcharset.h>
+ #endif /* end localcharset */
+ #else /* not WINDOWS */
+-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28)
+ #include <iconv.h>
+ #include <localcharset.h>
+ #else /* neither Mac OsX nor Android */
+diff --git a/src/freexl_xlsx.c b/src/freexl_xlsx.c
+index dc8891d..de56436 100644
+--- a/src/freexl_xlsx.c
+++ b/src/freexl_xlsx.c
+@@ -62,7 +62,7 @@ extern const char *locale_charset (void);
+ #include <localcharset.h>
+ #endif /* end localcharset */
+ #else /* not WINDOWS */
+-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28)
+ #include <iconv.h>
+ #include <localcharset.h>
+ #else /* neither Mac OsX nor Android */
--- a/ports/freexl/portfile.cmake
+++ b/ports/freexl/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_extract_source_archive(
    PATCHES
        dependencies.patch
        subdirs.patch
+        android-builtin-iconv.diff
 )

 vcpkg_configure_make(
--- a/ports/freexl/vcpkg.json
+++ b/ports/freexl/vcpkg.json
@@ -1,6 +1,7 @@
 {
  "name": "freexl",
  "version": "2.0.0",
+  "port-version": 1,
  "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet",
  "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources",
  "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later",
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -1,4 +1,18 @@
-if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID AND NOT VCPKG_TARGET_IS_IOS AND NOT VCPKG_TARGET_IS_FREEBSD AND NOT VCPKG_TARGET_IS_OPENBSD)
+if(NOT DEFINED X_VCPKG_BUILD_GNU_LIBICONV)
+    set(X_VCPKG_BUILD_GNU_LIBICONV 0)
+    if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD)
+        set(X_VCPKG_BUILD_GNU_LIBICONV 1)
+    elseif(VCPKG_TARGET_IS_ANDROID)
+        vcpkg_cmake_get_vars(cmake_vars_file)
+        include("${cmake_vars_file}")
+        if(VCPKG_DETECTED_CMAKE_SYSTEM_VERSION VERSION_LESS "28")
+            set(X_VCPKG_BUILD_GNU_LIBICONV 1)
+        endif()
+    endif()
+endif()
+
+if(NOT X_VCPKG_BUILD_GNU_LIBICONV)
+    message(STATUS "Not building GNU libiconv.")
    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv")
    file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv")
--- a/ports/libiconv/usage
+++ b/ports/libiconv/usage
@@ -1,4 +1,4 @@
-The package libiconv provides CMake targets:
+libiconv provides CMake targets:

-    find_package(Iconv)
-    target_link_libraries(main PRIVATE Iconv::Iconv)
+  find_package(Iconv REQUIRED)
+  target_link_libraries(main PRIVATE Iconv::Iconv)
--- a/ports/libiconv/vcpkg.json
+++ b/ports/libiconv/vcpkg.json
@@ -1,7 +1,18 @@
 {
  "name": "libiconv",
  "version": "1.18",
-  "description": "GNU Unicode text conversion",
+  "port-version": 1,
+  "description": [
+    "iconv() text conversion.",
+    "This port installs GNU libiconv if the system C runtime doesn't provide a suitable iconv() implementation."
+  ],
  "homepage": "https://www.gnu.org/software/libiconv/",
-  "license": null
+  "license": null,
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true,
+      "platform": "android"
+    }
+  ]
 }
--- a/ports/libspatialite/android-builtin-iconv.diff
+++ b/ports/libspatialite/android-builtin-iconv.diff
@@ -0,0 +1,35 @@
+diff --git a/src/gaiaaux/gg_utf8.c b/src/gaiaaux/gg_utf8.c
+index f11e604..620696e 100644
+--- a/src/gaiaaux/gg_utf8.c
+++ b/src/gaiaaux/gg_utf8.c
+@@ -73,7 +73,7 @@ extern const char *locale_charset (void);
+ #include <localcharset.h>
+ #endif /* end localcharset */
+ #else /* not MINGW32 - WIN32 */
+-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28)
+ #include <iconv.h>
+ #include <localcharset.h>
+ #else /* neither Mac OsX nor Android */
+@@ -89,7 +89,7 @@ gaiaGetLocaleCharset ()
+ #if defined(__MINGW32__) || defined(_WIN32)
+     return locale_charset ();
+ #else /* not MINGW32 - WIN32 */
+-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28)
+     return locale_charset ();
+ #else /* neither Mac OsX nor Android */
+     return nl_langinfo (CODESET);
+diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c
+index 8917535..e5e0240 100644
+--- a/src/gaiageo/gg_shape.c
+++ b/src/gaiageo/gg_shape.c
+@@ -75,7 +75,7 @@ extern const char *locale_charset (void);
+ #include <localcharset.h>
+ #endif /* end localcharset */
+ #else /* not MINGW32 */
+-#if defined(__APPLE__) || defined(__ANDROID__)
+#if defined(__APPLE__) || (defined(__ANDROID__) && __ANDROID_API__ < 28)
+ #include <iconv.h>
+ #include <localcharset.h>
+ #else /* neither Mac OsX nor Android */
--- a/ports/libspatialite/portfile.cmake
+++ b/ports/libspatialite/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive(
        gaiaconfig-msvc.patch
        fix-mingw.patch
        fix-utf8-source.patch
+        android-builtin-iconv.diff
 )

 vcpkg_check_features(OUT_FEATURE_OPTIONS unused
--- a/ports/libspatialite/vcpkg.json
+++ b/ports/libspatialite/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "libspatialite",
  "version": "5.1.0",
-  "port-version": 2,
+  "port-version": 3,
  "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.",
  "homepage": "https://www.gaia-gis.it/fossil/libspatialite/index",
  "license": null,
--- a/ports/libssh/android-glob-tilde.diff
+++ b/ports/libssh/android-glob-tilde.diff
@@ -0,0 +1,28 @@
+diff --git a/src/bind_config.c b/src/bind_config.c
+index 27c42c9..9e9c5f0 100644
+--- a/src/bind_config.c
+++ b/src/bind_config.c
+@@ -248,6 +248,9 @@ static void local_parse_glob(ssh_bind bind,
+     int rt;
+     u_int i;
+ 
+#if defined(__ANDROID__) && !defined(GLOB_TILDE)
+    const int GLOB_TILDE = 0;
+#endif
+     rt = glob(fileglob, GLOB_TILDE, NULL, &globbuf);
+     if (rt == GLOB_NOMATCH) {
+         globfree(&globbuf);
+diff --git a/src/config.c b/src/config.c
+index c5c4012..72a9bdd 100644
+--- a/src/config.c
+++ b/src/config.c
+@@ -249,6 +249,9 @@ static void local_parse_glob(ssh_session session,
+     int rt;
+     size_t i;
+ 
+#if defined(__ANDROID__) && !defined(GLOB_TILDE)
+    const int GLOB_TILDE = 0;
+#endif
+     rt = glob(fileglob, GLOB_TILDE, NULL, &globbuf);
+     if (rt == GLOB_NOMATCH) {
+         globfree(&globbuf);
--- a/ports/libssh/portfile.cmake
+++ b/ports/libssh/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
        0001-export-pkgconfig-file.patch
        0003-no-source-write.patch
        0004-file-permissions-constants.patch
+        android-glob-tilde.diff
 )

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
--- a/ports/libssh/vcpkg.json
+++ b/ports/libssh/vcpkg.json
@@ -1,6 +1,7 @@
 {
  "name": "libssh",
  "version": "0.10.6",
+  "port-version": 1,
  "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side",
  "homepage": "https://www.libssh.org/",
  "license": "LGPL-2.1-only",
--- a/ports/sockpp/android-strerror_r.diff
+++ b/ports/sockpp/android-strerror_r.diff
@@ -0,0 +1,13 @@
+diff --git a/src/exception.cpp b/src/exception.cpp
+index 72aae7e..7a56c60 100644
+--- a/src/exception.cpp
+++ b/src/exception.cpp
+@@ -66,7 +66,7 @@ string sys_error::error_str(int err)
+ 			buf, sizeof(buf), NULL);
+     #else
+     	#ifdef _GNU_SOURCE
+-			#if !defined(__GLIBC__)
+			#if !defined(__GLIBC__) && !defined(__ANDROID__)
+ 			// use the XSI standard behavior.
+ 				int e = strerror_r(err, buf, sizeof(buf));
+ 				auto s = strerror(e);
--- a/ports/sockpp/portfile.cmake
+++ b/ports/sockpp/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
    REF "v${VERSION}"
    SHA512 99191c9551ff345f96af9177d124c6e10f3da8e87021576058b63df82ee64461cb8fc134919fe390617200aebf222e70501e3cee43fc0a294596947669ed4f03
    HEAD_REF master
+    PATCHES
+        android-strerror_r.diff
 )

 vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "\${SOCKPP}-static" "\${SOCKPP}" IGNORE_UNCHANGED)
--- a/ports/sockpp/vcpkg.json
+++ b/ports/sockpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "sockpp",
  "version": "1.0.0",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.",
  "homepage": "https://github.com/fpagliughi/sockpp",
  "license": "BSD-3-Clause",
--- a/ports/suitesparse-lagraph/portfile.cmake
+++ b/ports/suitesparse-lagraph/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_cmake_configure(
    DISABLE_PARALLEL_CONFIGURE
    OPTIONS
        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+        -DBUILD_TESTING=OFF
        -DSUITESPARSE_USE_CUDA=OFF
        -DSUITESPARSE_USE_STRICT=ON
        -DSUITESPARSE_USE_FORTRAN=OFF
--- a/ports/suitesparse-lagraph/vcpkg.json
+++ b/ports/suitesparse-lagraph/vcpkg.json
@@ -2,6 +2,7 @@
  "$comment": "Use scripts/update_suitesparse.py to update all SuiteSparse ports",
  "name": "suitesparse-lagraph",
  "version-semver": "1.1.4",
+  "port-version": 1,
  "description": "LAGraph: Library plus test harness for collecting algorithms that use GraphBLAS",
  "homepage": "https://lagraph.readthedocs.io/en/latest/",
  "license": "BSD-2-Clause",
--- a/ports/treehopper/fix-dependences.patch
+++ b/ports/treehopper/fix-dependences.patch
@@ -9,8 +9,8 @@ index 8537305..db3d29b 100644
 -    target_link_libraries(treehopper usb-1.0 pthread)
 +    find_package(PkgConfig REQUIRED)
 +    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
-+
-+    target_link_libraries(treehopper PRIVATE PkgConfig::libusb pthread)
+    find_package(Threads REQUIRED)
+    target_link_libraries(treehopper PRIVATE PkgConfig::libusb ${CMAKE_THREAD_LIBS_INIT})
 elseif(WIN32)
     target_link_libraries(treehopper winusb setupapi)
 endif(APPLE)
--- a/ports/treehopper/portfile.cmake
+++ b/ports/treehopper/portfile.cmake
@@ -1,4 +1,4 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
@@ -10,8 +10,18 @@ vcpkg_from_github(
        fix-dependences.patch
 )

+if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID)
+    vcpkg_find_acquire_program(PKGCONFIG)
+endif()
+
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}/C++/API/"
+    OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        -DTHREADS_PREFER_PTHREAD_FLAG=ON
+    MAYBE_UNUSED_VARIABLES
+        PKG_CONFIG_EXECUTABLE
+        THREADS_PREFER_PTHREAD_FLAG
 )

 vcpkg_cmake_install()
--- a/ports/treehopper/vcpkg.json
+++ b/ports/treehopper/vcpkg.json
@@ -1,14 +1,14 @@
 {
  "name": "treehopper",
  "version": "1.11.3",
-  "port-version": 9,
+  "port-version": 10,
  "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.",
  "homepage": "https://treehopper.io",
-  "supports": "!staticcrt & !uwp",
+  "supports": "!uwp & !(static & staticcrt)",
  "dependencies": [
    {
      "name": "libusb",
-      "platform": "linux"
+      "platform": "android | linux"
    },
    {
      "name": "vcpkg-cmake",
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -55,18 +55,11 @@ apr:arm64-android=fail
 apr:x64-android=fail
 apsi:arm-neon-android=fail
 apsi:x64-android=fail
-# needs NDK w/ API level >=24, CI currently has API level 21
-aravis:arm-neon-android=fail
-aravis:arm64-android=fail
-aravis:x64-android=fail
 # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed
 arrayfire:x64-linux=fail
 avro-c:arm-neon-android=fail
 avro-c:arm64-android=fail
 avro-c:x64-android=fail
-azure-identity-cpp:arm-neon-android=fail
-azure-identity-cpp:arm64-android=fail
-azure-identity-cpp:x64-android=fail
 # C++20 conformant compiler required
 atliac-minitest:arm64-uwp=fail
 atliac-minitest:x64-linux=fail
@@ -83,13 +76,10 @@ bde:x64-windows-static-md=skip
 bde:x64-windows-static=skip
 bde:x64-windows=skip
 bde:x86-windows=skip
-benchmark:arm-neon-android=fail
-bento4:arm-neon-android=fail
 berkeleydb:arm-neon-android=fail
 berkeleydb:arm64-android=fail
 berkeleydb:x64-android=fail
 binlog:arm-neon-android=fail
-bit7z:arm-neon-android=fail
 ################################################################
 # <BLAS+LAPACK>
 # These skips need to match the decision tree for which backends we use; see ports/blas/portfile.cmake
@@ -265,10 +255,7 @@ cserialport:arm64-android=fail
 cserialport:x64-android=fail
 ctbench:arm64-osx=fail
 ctbench:x64-osx=fail
-# Needs android-28 (hidden before NDK r26)
-cyclonedds:arm-neon-android=fail
-cyclonedds:arm64-android=fail
-cyclonedds:x64-android=fail
+ctp:x64-android=fail
 czmq:arm-neon-android=fail
 czmq:arm64-android=fail
 czmq:x64-android=fail
@@ -320,12 +307,7 @@ elfutils:arm64-android=fail
 elfutils:arm64-osx=fail
 elfutils:x64-android=fail
 elfutils:x64-osx=fail
-evpp:arm-neon-android=fail
-evpp:arm64-android=fail
-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
@@ -354,9 +336,6 @@ fluidlite:x64-windows-static-md=skip
 fluidlite:x64-windows-static=skip
 fluidlite:x64-windows=skip
 fluidlite:x86-windows=skip
-fmem:arm-neon-android=fail
-fmem:arm64-android=fail
-fmem:x64-android=fail
 fmi4cpp:arm64-uwp=fail
 fmi4cpp:x64-uwp=fail
 folly:arm64-android=fail
@@ -446,10 +425,10 @@ gz-tools:arm-neon-android=fail
 gz-tools:arm64-android=fail
 gz-tools:x64-android=fail
 halide:x64-windows-static=fail
+hello-imgui:arm-neon-android=fail
+hello-imgui:arm64-android=fail
+hello-imgui:x64-android=fail
 hexl:x64-android=fail
-highs:arm-neon-android=fail
-highs:arm64-android=fail
-highs:x64-android=fail
 hpx:x64-windows-static=fail
 hwloc:arm-neon-android=fail
 hwloc:arm64-android=fail
@@ -512,27 +491,15 @@ lcm:x64-windows-static=fail
 leptonica:arm64-uwp=fail
 leptonica:x64-uwp=fail
 libaiff:x64-linux=fail
-libbson:arm-neon-android=fail
-libbson:arm64-android=fail
-libbson:x64-android=fail
-# needs android-28
-libcaer:arm-neon-android=fail
-libcaer:arm64-android=fail
-libcaer:x64-android=fail
 libcanberra:arm-neon-android=fail
 libcanberra:arm64-android=fail
 libcanberra:x64-android=fail
 libcpplocate:arm-neon-android=fail
 libcpplocate:arm64-android=fail
 libcpplocate:x64-android=fail
-libcrafter:arm-neon-android=fail
-libcrafter:arm64-android=fail
-libcrafter:x64-android=fail
 libdc1394:arm-neon-android=fail
 libdc1394:arm64-android=fail
 libdc1394:x64-android=fail
-# 32-bit needs android-24
-libflac:arm-neon-android=fail
 libfreenect2:arm64-windows-static-md=fail
 libfreenect2:arm64-windows=fail
 # error: call to undeclared function 'mktime_z'
@@ -542,10 +509,6 @@ libgnutls:x64-android=fail
 # Fails to build due to incompatible delcaration of select in macOS 14.2
 libgo:x64-android=fail
 libgo:x64-osx=fail
-# Missing system libraries on linux to run/prepare autoconf
-libgxps:arm-neon-android=fail
-libgxps:arm64-android=fail
-libgxps:x64-android=fail
 libgxps:x64-windows-static=fail
 libhdfs3:arm-neon-android=fail
 libhdfs3:arm64-android=fail
@@ -553,16 +516,9 @@ libhdfs3:arm64-osx=fail
 libhdfs3:x64-android=fail
 libhdfs3:x64-linux=fail
 libhdfs3:x64-osx=fail
-# needs android-24
-libimobiledevice-glue:arm-neon-android=fail
-libimobiledevice-glue:arm64-android=fail
-libimobiledevice-glue:x64-android=fail
 # 120 min build time for libjxl arm64-uwp-rel, reason unknown
 libjxl:arm64-uwp=skip
-liblo:arm-neon-android=fail
-liblo:arm64-android=fail
 liblo:arm64-uwp=fail
-liblo:x64-android=fail
 liblo:x64-uwp=fail
 # libmariadb conflicts with libmysql
 libmariadb:arm64-osx=skip
@@ -617,8 +573,6 @@ libqcow:x64-windows-static-md=skip
 libqcow:x64-windows-static=skip
 libqcow:x64-windows=skip
 libqcow:x86-windows=skip
-# 32-bit needs android-24
-libraw:arm-neon-android=fail
 # Conflicts with openssl
 libressl:arm-neon-android=skip
 libressl:arm64-android=skip
@@ -647,10 +601,6 @@ libtomcrypt:arm64-windows-static-md=fail
 libtomcrypt:arm64-windows=fail
 libusb-win32:arm64-uwp=fail
 libusb-win32:x64-uwp=fail
-# needs android-26
-libvhdi:arm-neon-android=fail
-libvhdi:arm64-android=fail
-libvhdi:x64-android=fail
 # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253
 libvmdk:arm-neon-android=skip
 libvmdk:arm64-android=skip
@@ -675,14 +625,10 @@ libxt:x64-windows=fail
 # Inline asm used doesn't appear to support arm64-windows:
 libxt:arm64-windows-static-md=fail
 libxt:arm64-windows=fail
-libzen:arm-neon-android=fail
 linenoise-ng:arm64-uwp=fail
 linenoise-ng:x64-uwp=fail
 linenoise-ng:x64-windows-static-md=fail
-live555:arm-neon-android=fail
-live555:arm64-android=fail
 live555:arm64-uwp=fail
-live555:x64-android=fail
 live555:x64-uwp=fail
 llfio:arm-neon-android=fail
 llfio:arm64-android=fail
@@ -696,8 +642,6 @@ llvm:x64-android=fail
 log4cplus:arm64-uwp=fail
 log4cplus:x64-uwp=fail
 log4cpp:x64-linux=fail # dynamic exception specifications
-# 32-bit needs android-24
-lua:arm-neon-android=fail
 magma:x64-linux=fail
 mchehab-zbar:arm-neon-android=fail
 mchehab-zbar:arm64-android=fail
@@ -716,7 +660,10 @@ memorymodule:arm-neon-android=fail
 memorymodule:arm64-android=fail
 memorymodule:x64-android=fail
 # Missing dependent libraries.
+mesa:arm-neon-android=fail
+mesa:arm64-android=fail
 mesa:arm64-osx=fail
+mesa:x64-android=fail
 mesa:x64-linux=fail
 mesa:x64-osx=fail
 minifb:arm-neon-android=fail
@@ -774,7 +721,9 @@ mpir:x64-windows=skip
 mpir:x86-windows=skip
 msmpi:arm64-windows-static-md=fail
 msmpi:arm64-windows=fail
-munit:x64-android=fail
+msquic:arm-neon-android=fail
+msquic:arm64-android=fail
+msquic:x64-android=fail
 nana:arm-neon-android=fail
 nana:arm64-android=fail
 nana:arm64-osx=fail
@@ -797,6 +746,7 @@ oatpp-libressl:x64-android=fail
 offscale-libetcd-cpp:arm64-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
 ogdf:arm64-android=fail
+ogre-next:arm-neon-android=fail
 ois:x64-android=fail
 # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
 # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
@@ -852,6 +802,9 @@ optional-bare:x86-windows=skip
 orc:arm-neon-android=fail
 orc:arm64-android=fail
 orc:x64-android=fail
+outcome:arm-neon-android=fail
+outcome:arm64-android=fail
+outcome:x64-android=fail
 paho-mqtt:arm64-uwp=fail
 paho-mqtt:x64-uwp=fail
 pcl:x64-android=fail
@@ -877,19 +830,13 @@ popsift:x64-windows-release=fail
 popsift:x64-windows-static-md=fail
 popsift:x64-windows-static=fail
 popsift:x64-windows=fail
-ptex:arm-neon-android=fail
-ptex:arm64-android=fail
-ptex:x64-android=fail
 python2:arm-neon-android=fail
 python2:arm64-android=fail
 python2:x64-android=fail
 python3:arm-neon-android=fail
 python3:arm64-android=fail
 python3:x64-android=fail
-qpid-proton:arm-neon-android=fail
-qpid-proton:arm64-android=fail
 qpid-proton:arm64-uwp=fail
-qpid-proton:x64-android=fail
 qpid-proton:x64-uwp=fail
 qpid-proton:x64-windows-static=fail
 qt5-base:arm-neon-android=fail
@@ -921,9 +868,6 @@ qtwayland:x64-osx=skip
 quickfix:arm-neon-android=fail
 quickfix:arm64-android=fail
 qwt-qt6:x64-osx=fail
-rabit:arm-neon-android=fail
-rabit:arm64-android=fail
-rabit:x64-android=fail
 range-v3-vs2015:arm-neon-android=skip
 range-v3-vs2015:arm64-android=skip
 range-v3-vs2015:arm64-osx=skip
@@ -964,9 +908,6 @@ rbdl-orb:x64-windows-static-md=skip
 rbdl-orb:x64-windows-static=skip
 rbdl-orb:x64-windows=skip
 rbdl-orb:x86-windows=skip
-replxx:arm-neon-android=fail
-replxx:arm64-android=fail
-replxx:x64-android=fail
 restbed:arm-neon-android=fail
 restbed:arm64-android=fail
 restbed:arm64-uwp=fail
@@ -1076,7 +1017,6 @@ spscqueue:x64-android=fail
 # sqlpp11-connector-mysql: CI issues resolved by overlay port
 stormlib:arm64-uwp=fail
 stormlib:x64-uwp=fail
-stxxl:arm-neon-android=fail
 # _Interlocked* intrinsic functions are not available on x86
 suitesparse-graphblas:x86-windows=fail
 # "ninja: error: failed recompaction: Permission denied"
@@ -1086,10 +1026,6 @@ suitesparse-graphblas:arm64-windows=fail
 # uwp: "unresolved external symbol __imp_RoInitialize referenced in function __scrt_initialize_winrt"
 suitesparse-graphblas:arm64-uwp=fail
 suitesparse-graphblas:x64-uwp=fail
-# Android API level 23 or newer is required for complex math support
-suitesparse-graphblas:arm-neon-android=fail
-suitesparse-graphblas:arm64-android=fail
-suitesparse-graphblas:x64-android=fail
 systemc:arm64-uwp=fail
 systemc:arm64-windows-static-md=fail
 systemc:arm64-windows=fail
@@ -1119,7 +1055,6 @@ tensorflow-cc:x64-osx=skip
 tensorflow:x64-linux=skip
 tensorflow-cc:x64-linux=skip

-thorvg:arm-neon-android=fail
 tinycthread:arm-neon-android=fail
 tinycthread:arm64-android=fail
 tinycthread:x64-android=fail
@@ -1137,10 +1072,6 @@ tvision:x64-android=fail
 urho3d:x64-osx=fail
 # Proper support for a true static usd build is left as a future port improvement. It probably require fiddling with its monolithic mode.
 usd:x64-windows-static=skip
-# needs android-24
-usrsctp:arm-neon-android=fail
-usrsctp:arm64-android=fail
-usrsctp:x64-android=fail
 # the version of v8 we have in the repo doesn't support VS2022
 v8:x64-android=fail
 v8:x64-windows-release=fail
@@ -1154,28 +1085,10 @@ vowpal-wabbit:x64-android=fail
 # vst3sdk CMake files work only with the GUI version of Xcode
 vst3sdk:arm64-osx=fail
 vst3sdk:x64-osx=fail
-vtk-m:arm-neon-android=fail
-vtk-m:arm64-android=fail
-vtk-m:x64-android=fail
-# Needs android-24 to supply a vulkan loader library
-vulkan:arm-neon-android=fail
-vulkan:arm64-android=fail
-vulkan:x64-android=fail
-vulkan-extensionlayer:arm-neon-android=fail
-vulkan-extensionlayer:arm64-android=fail
-vulkan-extensionlayer:x64-android=fail
 vulkan-extensionlayer:x64-windows-static=fail
-# Needs android-26
-vulkan-validationlayers:arm-neon-android=fail
-vulkan-validationlayers:arm64-android=fail
-vulkan-validationlayers:x64-android=fail
 wasmedge:arm-neon-android=fail
-wasmedge:arm64-android=fail
-wasmedge:x64-android=fail
 wavpack:arm-neon-android=fail
 wavpack:x64-android=fail
-# 32-bit needs android-24
-wcslib:arm-neon-android=fail
 # Collides with libpcap -> similar headers
 winpcap:x64-windows-release=skip
 winpcap:x64-windows=skip
--- a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
@@ -10,7 +10,7 @@
      "features": [
        "mpi"
      ],
-      "platform": "!staticcrt & !(arm & windows) & !uwp"
+      "platform": "!staticcrt & !android & !(arm & windows) & !uwp"
    },
    {
      "name": "boost-asio",
@@ -41,7 +41,7 @@
      "features": [
        "python3"
      ],
-      "platform": "!staticcrt & !static & !uwp & !(arm & windows)"
+      "platform": "!staticcrt & !static & !android & !(arm & windows) & !uwp"
    },
    {
      "name": "boost-odeint",
@@ -49,7 +49,7 @@
      "features": [
        "mpi"
      ],
-      "platform": "!staticcrt & !uwp & !(windows & arm)"
+      "platform": "!staticcrt & !android & !(windows & arm) & !uwp"
    },
    {
      "name": "boost-python",
--- a/triplets/arm-neon-android.cmake
+++ b/triplets/arm-neon-android.cmake
@@ -1,6 +1,7 @@
 set(VCPKG_TARGET_ARCHITECTURE arm)
-set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_CMAKE_SYSTEM_VERSION 28)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON)
--- a/triplets/arm64-android.cmake
+++ b/triplets/arm64-android.cmake
@@ -1,6 +1,7 @@
 set(VCPKG_TARGET_ARCHITECTURE arm64)
-set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_CMAKE_SYSTEM_VERSION 28)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a)
--- a/triplets/community/arm-android.cmake
+++ b/triplets/community/arm-android.cmake
@@ -1,6 +1,7 @@
 set(VCPKG_TARGET_ARCHITECTURE arm)
-set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_CMAKE_SYSTEM_VERSION 28)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=OFF)
--- a/triplets/community/x86-android.cmake
+++ b/triplets/community/x86-android.cmake
@@ -1,6 +1,7 @@
 set(VCPKG_TARGET_ARCHITECTURE x86)
-set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_CMAKE_SYSTEM_VERSION 28)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86)
--- a/triplets/x64-android.cmake
+++ b/triplets/x64-android.cmake
@@ -1,6 +1,7 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
-set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_CMAKE_SYSTEM_VERSION 28)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86_64)
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1502,7 +1502,7 @@
    },
    "calceph": {
      "baseline": "4.0.4",
-      "port-version": 0
+      "port-version": 1
    },
    "camport3": {
      "baseline": "1.6.2",
@@ -2954,7 +2954,7 @@
    },
    "freexl": {
      "baseline": "2.0.0",
-      "port-version": 0
+      "port-version": 1
    },
    "fribidi": {
      "baseline": "1.0.16",
@@ -4722,7 +4722,7 @@
    },
    "libiconv": {
      "baseline": "1.18",
-      "port-version": 0
+      "port-version": 1
    },
    "libics": {
      "baseline": "1.6.8",
@@ -5218,7 +5218,7 @@
    },
    "libspatialite": {
      "baseline": "5.1.0",
-      "port-version": 2
+      "port-version": 3
    },
    "libspnav": {
      "baseline": "0.2.3",
@@ -5242,7 +5242,7 @@
    },
    "libssh": {
      "baseline": "0.10.6",
-      "port-version": 0
+      "port-version": 1
    },
    "libssh2": {
      "baseline": "1.11.1",
@@ -8650,7 +8650,7 @@
    },
    "sockpp": {
      "baseline": "1.0.0",
-      "port-version": 1
+      "port-version": 2
    },
    "soem": {
      "baseline": "2023-06-09",
@@ -8978,7 +8978,7 @@
    },
    "suitesparse-lagraph": {
      "baseline": "1.1.4",
-      "port-version": 0
+      "port-version": 1
    },
    "suitesparse-ldl": {
      "baseline": "3.3.2",
@@ -9350,7 +9350,7 @@
    },
    "treehopper": {
      "baseline": "1.11.3",
-      "port-version": 9
+      "port-version": 10
    },
    "triangle": {
      "baseline": "1.6",
--- a/versions/c-/calceph.json
+++ b/versions/c-/calceph.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ddfc19ed3c74649c11532a77211a3fe38c199365",
+      "version": "4.0.4",
+      "port-version": 1
+    },
    {
      "git-tree": "08d3667453a109eb1030f613e946d0fbdf64e1ad",
      "version": "4.0.4",
--- a/versions/f-/freexl.json
+++ b/versions/f-/freexl.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "394ec764c0c7b29123e1e148439ae06c79477831",
+      "version": "2.0.0",
+      "port-version": 1
+    },
    {
      "git-tree": "d2f0c530b5cb259f17171cb8fc6b58e3642e9334",
      "version": "2.0.0",
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c7ce740f9836b013ac115182995c89efca3327c9",
+      "version": "1.18",
+      "port-version": 1
+    },
    {
      "git-tree": "e6b1ec6194b4adf7c08d114be8dcc848950094e1",
      "version": "1.18",
--- a/versions/l-/libspatialite.json
+++ b/versions/l-/libspatialite.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4af3520aa78e5014904812d70a1b6f1fadebd068",
+      "version": "5.1.0",
+      "port-version": 3
+    },
    {
      "git-tree": "f8438c112988c7e7584e53cef7ada05875b78d57",
      "version": "5.1.0",
--- a/versions/l-/libssh.json
+++ b/versions/l-/libssh.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "179b87db359bda2e015e67cb5eecd462502beae6",
+      "version": "0.10.6",
+      "port-version": 1
+    },
    {
      "git-tree": "0e899f7f2836ea17c95413604158205e5afb8378",
      "version": "0.10.6",
--- a/versions/s-/sockpp.json
+++ b/versions/s-/sockpp.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "66ad1fa2ec2342ff88b2272a6f18a656effbd50a",
+      "version": "1.0.0",
+      "port-version": 2
+    },
    {
      "git-tree": "49840e52d204c5a361ea308bee8533ee896e771d",
      "version": "1.0.0",
--- a/versions/s-/suitesparse-lagraph.json
+++ b/versions/s-/suitesparse-lagraph.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "1bb3ac6605cceb8c514fe52747b38b82722c3c7b",
+      "version-semver": "1.1.4",
+      "port-version": 1
+    },
    {
      "git-tree": "09ad074c071367bc56c4fabe050329229c1178e7",
      "version-semver": "1.1.4",
--- a/versions/t-/treehopper.json
+++ b/versions/t-/treehopper.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f11e05d9831f2670955b1a90bf28a8c6f6c984b2",
+      "version": "1.11.3",
+      "port-version": 10
+    },
    {
      "git-tree": "145e9145dba553063f0483909603c6369c5a4e63",
      "version": "1.11.3",