Android NDK r28b

ports/argtable2/portfile.cmake

@@ -10,6 +10,7 @@ vcpkg_from_sourceforge(
         0001-fix-install-dirs.patch
         0002-include-correct-headers.patch
         0003-add-dependence-getopt.patch
+        undef-eoverflow.diff
 )
 
 set(HAVE_GETOPT_H "")

ports/argtable2/undef-eoverflow.diff

@@ -0,0 +1,14 @@
+diff --git a/src/arg_int.c b/src/arg_int.c
+index bc10012..ffcd408 100644
+--- a/src/arg_int.c
++++ b/src/arg_int.c
+@@ -33,6 +33,9 @@ USA.
+ #include <ctype.h>
+
+ /* local error codes */
++#ifdef EOVERFLOW
++#undef EOVERFLOW
++#endif
+ enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,EOVERFLOW};
+
+ static void resetfn(struct arg_int *parent)

ports/argtable2/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "argtable2",
   "version": "2.13",
-  "port-version": 10,
+  "port-version": 11,
   "description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.",
   "homepage": "http://argtable.sourceforge.net",
   "license": "LGPL-2.0-only",

ports/mygui/portfile.cmake

@@ -1,3 +1,10 @@
+vcpkg_download_distfile(
+    basic_string_patch
+    URLS "https://github.com/MyGUI/mygui/commit/0731785d83431bd17a0854f19bea9a7d687de5a7.diff?full_index=1"
+    FILENAME "MyGUI-mygui-basic-string-0731785.diff"
+    SHA512 4ca252b8d37d9b98b9a1295c181325a33c30534757f8adbbcceceafacd97ff6987fb7a5d1f087b960519c923007e6adff2e8b1d873d75e7faff05b9a20b9cd79
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MyGUI/mygui
@@ -11,6 +18,7 @@ vcpkg_from_github(
         sdl2-static.patch
         fix-tools-lnk2005.patch
         platform-lib-static.patch
+        ${basic_string_patch}
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")

ports/mygui/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "mygui",
   "version": "3.4.3",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Fast, flexible and simple GUI",
   "homepage": "http://mygui.info",
   "license": "MIT",
@@ -24,6 +24,7 @@
     },
     "opengl": {
       "description": "Use OpenGL render system.",
+      "supports": "!android",
       "dependencies": [
         "opengl"
       ]
@@ -32,7 +33,8 @@
       "description": "Build MyGUI plugins."
     },
     "tools": {
-      "description": "Install MyGUI tools."
+      "description": "Install MyGUI tools.",
+      "supports": "!android"
     }
   }
 }

scripts/azure-pipelines/android/Dockerfile

@@ -8,7 +8,7 @@ ADD https://dl.google.com/android/repository/commandlinetools-linux-10406996_lat
 ADD https://dl.google.com/android/repository/build-tools_r34-linux.zip /build-tools_r34-linux.zip
 ADD https://dl.google.com/android/repository/platform-34-ext7_r03.zip /platform-34-ext7_r03.zip
 ADD https://dl.google.com/android/repository/platform-tools_r35.0.1-linux.zip /platform-tools_r35.0.1-linux.zip
-ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip
+ADD https://dl.google.com/android/repository/android-ndk-r28b-linux.zip /android-ndk-r28b-linux.zip
 
 # Add apt packages
 
@@ -94,15 +94,15 @@ export JAVA_HOME=/jdk-17.0.14+7
 yes | /android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=/android-sdk --licenses
 
 # Android NDK
-unzip -q /android-ndk-r27c-linux.zip
-rm -f android-ndk-r27c-linux.zip
+unzip -q /android-ndk-r28b-linux.zip
+rm -f android-ndk-r28b-linux.zip
 
 END_OF_SCRIPT
 
 ENV JAVA_HOME /jdk-17.0.14+7
 
 ENV ANDROID_HOME /android-sdk
 
-ENV ANDROID_NDK_HOME /android-ndk-r27c
+ENV ANDROID_NDK_HOME /android-ndk-r28b
 
 WORKDIR /vcpkg

scripts/azure-pipelines/test-modified-ports.ps1

@@ -128,6 +128,19 @@ if ($Triplet -eq 'x64-windows-release') {
     $tripletArg = "--triplet=$Triplet"
 }
 
+$override_ndk = 'r28b'
+if ($IsLinux -and $Triplet -match 'android' -and $override_ndk -ne '')
+{
+    $override_ndk_url = 'https://dl.google.com/android/repository/android-ndk-r28b-linux.zip'
+    $override_ndk_sha512 = '25f4517febcc6a37a762ec158daf42ff4bd6fd6ea643959395eef109f4f29a8f5256ee997f7c40fee66282686f19cd254c17d2f7ccfa80a4f601bff262997f57'
+    Write-Host "Downloading Android NDK $override_ndk"
+    & "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=$override_ndk_url" @cachingArgs
+    Write-Host "Unpacking"
+    & unzip -q android-ndk-$override_ndk-linux.zip
+    $env:ANDROID_NDK_HOME = Join-Path $Pwd "android-ndk-$override_ndk"
+    $NoParentHashes = $true
+}
+
 $failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs'
 $failureLogsArg = "--failure-logs=$failureLogs"
 $knownFailuresFromArgs = @()

scripts/ci.baseline.txt

@@ -116,6 +116,10 @@ clapack:x64-windows-static-md=skip
 clapack:x64-windows-static=skip
 clapack:x64-windows=skip
 clapack:x86-windows=skip
+# std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
+cpprestsdk:arm-neon-android=fail
+cpprestsdk:arm64-android=fail
+cpprestsdk:x64-android=fail
 lapack-reference:arm-neon-android=fail
 lapack-reference:arm64-android=fail
 lapack-reference:arm64-osx=skip
@@ -719,6 +723,10 @@ offscale-libetcd-cpp:x64-uwp=fail
 ogdf:arm64-android=fail
 ogre-next:arm-neon-android=fail
 ois:x64-android=fail
+# std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
+ogre-next:arm-neon-android=fail
+ogre-next:arm64-android=fail
+ogre-next: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.
 opencc:x64-android=fail
@@ -770,7 +778,11 @@ orc:x64-android=fail
 outcome:arm-neon-android=fail
 outcome:arm64-android=fail
 outcome:x64-android=fail
+# std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
+paho-mqtt:arm-neon-android=fail
+paho-mqtt:arm64-android=fail
 paho-mqtt:arm64-uwp=fail
+paho-mqtt:x64-android=fail
 paho-mqtt:x64-uwp=fail
 pcl:x64-android=fail
 platform-folders:arm64-uwp=fail
@@ -781,6 +793,10 @@ plib:x64-android=fail
 pmdk:x64-android=fail
 pmdk:x64-osx=fail
 pmdk:x64-windows-static=fail
+# std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
+poppler:arm-neon-android=fail
+poppler:arm64-android=fail
+poppler:x64-android=fail
 # popsift is broken with CUDA 12.6 and later, and we test with 12.8, see https://github.com/alicevision/popsift/issues/161
 popsift:x64-windows-release=fail
 popsift:x64-windows-static-md=fail
@@ -948,6 +964,10 @@ sjpeg:x64-android=fail
 sleef:arm-neon-android=fail
 sleef:arm64-android=fail
 sleef:x86-windows=fail
+# std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
+sleepy-discord:arm-neon-android=fail
+sleepy-discord:arm64-android=fail
+sleepy-discord:x64-android=fail
 slikenet:arm-neon-android=fail
 slikenet:arm64-android=fail
 slikenet:x64-android=fail
@@ -991,7 +1011,9 @@ suitesparse-graphblas:x64-uwp=fail
 systemc:arm64-uwp=fail
 systemc:x64-uwp=fail
 teemo:x64-android=fail
-
+telnetpp:arm-neon-android=fail
+telnetpp:arm64-android=fail
+telnetpp:x64-android=fail
 # tensorflow does not support VS2022
 tensorflow:x64-android=skip
 tensorflow:x64-windows-release=skip

scripts/ci.feature.baseline.txt

@@ -86,6 +86,7 @@ cpp-netlib(uwp)=fail
 cppcoro(uwp | linux | osx)=fail
 cppfs(uwp)=fail
 cppmicroservices(uwp | (windows & arm))=fail
+cpprestsdk(android)=fail
 crashpad:x86-windows=fail
 ctemplate:x64-linux=fail
 ctemplate:x64-osx=fail
@@ -357,6 +358,7 @@ ode:arm64-windows=fail
 ode:x64-uwp=fail
 offscale-libetcd-cpp:arm-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
+ogre-next(android)=fail
 open62541:x64-windows-static-md=fail
 opencc:arm64-windows=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
 opencc(uwp)=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
@@ -379,8 +381,8 @@ openvr:x64-uwp=fail
 openvr:x64-windows-static=fail
 opusfile:arm-uwp=fail
 opusfile:x64-uwp=fail
-paho-mqtt:arm-uwp=fail
-paho-mqtt:x64-uwp=fail
+paho-mqtt(android)=fail
+paho-mqtt(uwp)=fail
 pfring:arm64-osx=fail
 pfring:x64-osx=fail
 pixman:arm-uwp=fail
@@ -398,6 +400,7 @@ pmdk:x64-osx=fail
 pmdk:x64-uwp=fail
 pmdk:x64-windows-static=fail
 pmdk:x86-windows=fail
+poppler(android)=fail
 popsift:x64-windows-static-md=fail
 portable-snippets:arm-uwp=fail
 qbittorrent:x64-linux=fail # Not yet ready for these platforms.
@@ -476,6 +479,7 @@ shiva-sfml:x86-windows=fail
 signalrclient:arm-uwp=fail
 simbody:arm64-windows=fail
 sleef:x86-windows=fail
+sleepy-discord(android)=fail
 slikenet:arm-uwp=fail
 slikenet:x64-uwp=fail
 sockpp:arm-uwp=fail
@@ -517,8 +521,8 @@ systemc:x64-uwp=fail
 tcl:arm-uwp=fail
 tcl:arm64-windows=fail
 tcl:x64-uwp=fail
-telnetpp:arm-uwp=fail
-telnetpp:x64-uwp=fail
+telnetpp(android)=fail
+telnetpp(uwp)=fail
 tensorflow-cc(windows)=fail # tensorflow does not support VS2022
 tensorflow(windows)=fail # tensorflow does not support VS2022
 tidy-html5:arm-uwp=fail

versions/a-/argtable2.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cd58801d3074f08b7d3145cd25d63ad72cbdbf6b",
+      "version": "2.13",
+      "port-version": 11
+    },
     {
       "git-tree": "931507f46135a9267c3d15ed5064235aac6154f4",
       "version": "2.13",

versions/baseline.json

@@ -230,7 +230,7 @@
     },
     "argtable2": {
       "baseline": "2.13",
-      "port-version": 10
+      "port-version": 11
     },
     "argtable3": {
       "baseline": "3.3.0.116da6c",
@@ -6430,7 +6430,7 @@
     },
     "mygui": {
       "baseline": "3.4.3",
-      "port-version": 3
+      "port-version": 4
     },
     "mypaint-brushes": {
       "baseline": "1.3.1",

versions/m-/mygui.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "12aa141343c23a82d77966a0eeff2818214e0b4b",
+      "version": "3.4.3",
+      "port-version": 4
+    },
     {
       "git-tree": "d6dd68e15957cce25c9ef64b626d8db2ddc838f2",
       "version": "3.4.3",