Skip to content

Commit 7ebfec6

Browse files
dg0ytBillyONeal
dg0yt
and
BillyONeal
authored
Android NDK r28c (#41293)
Co-authored-by: Billy Robert O'Neal III <[email protected]>
1 parent f993fc4 commit 7ebfec6

File tree

13 files changed

+74
-19
lines changed

13 files changed

+74
-19
lines changed

‎ports/argtable2/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ vcpkg_from_sourceforge(
1010
0001-fix-install-dirs.patch
1111
0002-include-correct-headers.patch
1212
0003-add-dependence-getopt.patch
13+
undef-eoverflow.diff
1314
)
1415

1516
set(HAVE_GETOPT_H "")

‎ports/argtable2/undef-eoverflow.diff

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/src/arg_int.c b/src/arg_int.c
2+
index bc10012..ffcd408 100644
3+
--- a/src/arg_int.c
4+
+++ b/src/arg_int.c
5+
@@ -33,6 +33,9 @@ USA.
6+
#include <ctype.h>
7+
8+
/* local error codes */
9+
+#ifdef EOVERFLOW
10+
+#undef EOVERFLOW
11+
+#endif
12+
enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,EOVERFLOW};
13+
14+
static void resetfn(struct arg_int *parent)

‎ports/argtable2/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "argtable2",
33
"version": "2.13",
4-
"port-version": 10,
4+
"port-version": 11,
55
"description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.",
66
"homepage": "http://argtable.sourceforge.net",
77
"license": "LGPL-2.0-only",

‎ports/mygui/portfile.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
vcpkg_download_distfile(
2+
basic_string_patch
3+
URLS "https://github.com/MyGUI/mygui/commit/0731785d83431bd17a0854f19bea9a7d687de5a7.diff?full_index=1"
4+
FILENAME "MyGUI-mygui-basic-string-0731785.diff"
5+
SHA512 4ca252b8d37d9b98b9a1295c181325a33c30534757f8adbbcceceafacd97ff6987fb7a5d1f087b960519c923007e6adff2e8b1d873d75e7faff05b9a20b9cd79
6+
)
7+
18
vcpkg_from_github(
29
OUT_SOURCE_PATH SOURCE_PATH
310
REPO MyGUI/mygui
@@ -11,6 +18,7 @@ vcpkg_from_github(
1118
sdl2-static.patch
1219
fix-tools-lnk2005.patch
1320
platform-lib-static.patch
21+
${basic_string_patch}
1422
)
1523

1624
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")

‎ports/mygui/vcpkg.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "mygui",
33
"version": "3.4.3",
4-
"port-version": 3,
4+
"port-version": 4,
55
"description": "Fast, flexible and simple GUI",
66
"homepage": "http://mygui.info",
77
"license": "MIT",
@@ -24,6 +24,7 @@
2424
},
2525
"opengl": {
2626
"description": "Use OpenGL render system.",
27+
"supports": "!android",
2728
"dependencies": [
2829
"opengl"
2930
]
@@ -32,7 +33,8 @@
3233
"description": "Build MyGUI plugins."
3334
},
3435
"tools": {
35-
"description": "Install MyGUI tools."
36+
"description": "Install MyGUI tools.",
37+
"supports": "!android"
3638
}
3739
}
3840
}

‎scripts/azure-pipelines/android/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# syntax=docker/dockerfile:1.4
22
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
3-
FROM ubuntu:noble-20250619
3+
FROM ubuntu:noble-20250714
44

55
ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
66
ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz
77
ADD https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip /sdk-commandlinetools-linux-10406996_latest.zip
88
ADD https://dl.google.com/android/repository/build-tools_r34-linux.zip /build-tools_r34-linux.zip
99
ADD https://dl.google.com/android/repository/platform-34-ext7_r03.zip /platform-34-ext7_r03.zip
1010
ADD https://dl.google.com/android/repository/platform-tools_r35.0.1-linux.zip /platform-tools_r35.0.1-linux.zip
11-
ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip
11+
ADD https://dl.google.com/android/repository/android-ndk-r28c-linux.zip /android-ndk-r28c-linux.zip
1212

1313
# Add apt packages
1414

@@ -94,15 +94,15 @@ export JAVA_HOME=/jdk-17.0.14+7
9494
yes | /android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=/android-sdk --licenses
9595

9696
# Android NDK
97-
unzip -q /android-ndk-r27c-linux.zip
98-
rm -f android-ndk-r27c-linux.zip
97+
unzip -q /android-ndk-r28c-linux.zip
98+
rm -f android-ndk-r28c-linux.zip
9999

100100
END_OF_SCRIPT
101101

102102
ENV JAVA_HOME /jdk-17.0.14+7
103103

104104
ENV ANDROID_HOME /android-sdk
105105

106-
ENV ANDROID_NDK_HOME /android-ndk-r27c
106+
ENV ANDROID_NDK_HOME /android-ndk-r28c
107107

108108
WORKDIR /vcpkg

‎scripts/azure-pipelines/android/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
- name: VCPKG_DOWNLOADS
2727
value: /mnt/vcpkg-ci/downloads
2828
- name: ANDROID_NDK_HOME
29-
value: /android-ndk-r27c
29+
value: /android-ndk-r28c
3030
- name: ANDROID_DOCKER_IMAGE
31-
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-07-10'
31+
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android-r28c:2025-08-01'
3232
- name: LINUX_DOCKER_IMAGE
3333
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-07-10'
3434
steps:

‎scripts/azure-pipelines/create-docker-images.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Connect-AzContainerRegistry -Name $registry.Name
5656
if ($BuildAndroid) {
5757
Build-Image -AcrRegistry $registry `
5858
-Location "$PSScriptRoot/android" `
59-
-ImageName "vcpkg-android" `
59+
-ImageName "vcpkg-android-r28c" `
6060
-Date $Date
6161
}
6262

‎scripts/ci.baseline.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ clapack:x64-windows-static-md=skip
113113
clapack:x64-windows-static=skip
114114
clapack:x64-windows=skip
115115
clapack:x86-windows=skip
116+
cpprestsdk:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
117+
cpprestsdk:arm64-android=fail
118+
cpprestsdk:x64-android=fail
116119
lapack-reference:arm-neon-android=fail
117120
lapack-reference:arm64-android=fail
118121
lapack-reference:arm64-osx=skip
@@ -722,7 +725,9 @@ octave:x64-osx=fail
722725
offscale-libetcd-cpp:arm64-uwp=fail
723726
offscale-libetcd-cpp:x64-uwp=fail
724727
ogdf:arm64-android=fail
725-
ogre-next:arm-neon-android=fail
728+
ogre-next:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
729+
ogre-next:arm64-android=fail
730+
ogre-next:x64-android=fail
726731
ois:x64-android=fail
727732
omniorb:arm-neon-android=fail
728733
omniorb:arm64-android=fail
@@ -775,7 +780,10 @@ orange-math:x64-linux=fail
775780
orc:arm-neon-android=fail
776781
orc:arm64-android=fail
777782
orc:x64-android=fail
783+
paho-mqtt:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
784+
paho-mqtt:arm64-android=fail
778785
paho-mqtt:arm64-uwp=fail
786+
paho-mqtt:x64-android=fail
779787
paho-mqtt:x64-uwp=fail
780788
platform-folders:arm64-uwp=fail
781789
platform-folders:x64-uwp=fail
@@ -785,6 +793,9 @@ plib:x64-android=fail
785793
pmdk:x64-android=fail
786794
pmdk:x64-osx=fail
787795
pmdk:x64-windows-static=fail
796+
poppler:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
797+
poppler:arm64-android=fail
798+
poppler:x64-android=fail
788799
# popsift is broken with CUDA 12.6 and later, and we test with 12.8, see https://github.com/alicevision/popsift/issues/161
789800
popsift:x64-windows-release=fail
790801
popsift:x64-windows-static-md=fail
@@ -933,6 +944,9 @@ sjpeg:x64-android=fail
933944
sleef:arm-neon-android=fail
934945
sleef:arm64-android=fail
935946
sleef:x86-windows=fail
947+
sleepy-discord:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561
948+
sleepy-discord:arm64-android=fail
949+
sleepy-discord:x64-android=fail
936950
slikenet:arm-neon-android=fail
937951
slikenet:arm64-android=fail
938952
slikenet:x64-android=fail
@@ -976,7 +990,9 @@ suitesparse-graphblas:x64-uwp=fail
976990
systemc:arm64-uwp=fail
977991
systemc:x64-uwp=fail
978992
teemo:x64-android=fail
979-
993+
telnetpp:arm-neon-android=fail
994+
telnetpp:arm64-android=fail
995+
telnetpp:x64-android=fail
980996
# tensorflow does not support VS2022
981997
tensorflow:x64-android=skip
982998
tensorflow:x64-windows-release=skip

‎scripts/ci.feature.baseline.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ cpp-netlib(uwp)=fail
9090
cppcoro(uwp | linux | osx)=fail
9191
cppfs(uwp)=fail
9292
cppmicroservices(uwp | (windows & arm))=fail
93+
cpprestsdk(android)=fail
9394
crashpad:x64-linux=fail
9495
ctemplate:x64-linux=fail
9596
ctemplate:x64-osx=fail
@@ -347,6 +348,7 @@ ode:arm64-windows=fail
347348
ode:x64-uwp=fail
348349
offscale-libetcd-cpp:arm-uwp=fail
349350
offscale-libetcd-cpp:x64-uwp=fail
351+
ogre-next(android)=fail
350352
open62541:x64-windows-static-md=fail
351353
opencc:arm64-windows=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
352354
opencc:x64-android=fail
@@ -387,8 +389,8 @@ openvr:x64-uwp=fail
387389
openvr:x64-windows-static=fail
388390
opusfile:arm-uwp=fail
389391
opusfile:x64-uwp=fail
390-
paho-mqtt:arm-uwp=fail
391-
paho-mqtt:x64-uwp=fail
392+
paho-mqtt(android)=fail
393+
paho-mqtt(uwp)=fail
392394
pfring:arm64-osx=fail
393395
pfring:x64-osx=fail
394396
pixman:arm-uwp=fail
@@ -404,6 +406,7 @@ pmdk:x64-osx=fail
404406
pmdk:x64-uwp=fail
405407
pmdk:x64-windows-static=fail
406408
pmdk:x86-windows=fail
409+
poppler(android)=fail
407410
popsift:x64-windows-static-md=fail
408411
portable-snippets:arm-uwp=fail
409412
qbittorrent:x64-linux=fail # Not yet ready for these platforms.
@@ -479,6 +482,7 @@ signalrclient:arm-uwp=fail
479482
simbody:arm64-windows=fail
480483
simd(android)=fail
481484
sleef:x86-windows=fail
485+
sleepy-discord(android)=fail
482486
slikenet:arm-uwp=fail
483487
slikenet:x64-uwp=fail
484488
sockpp:arm-uwp=fail
@@ -521,8 +525,8 @@ systemc:x64-uwp=fail
521525
tcl:arm-uwp=fail
522526
tcl:arm64-windows=fail
523527
tcl:x64-uwp=fail
524-
telnetpp:arm-uwp=fail
525-
telnetpp:x64-uwp=fail
528+
telnetpp(android)=fail
529+
telnetpp(uwp)=fail
526530
tensorflow-cc(windows)=fail # tensorflow does not support VS2022
527531
tensorflow(windows)=fail # tensorflow does not support VS2022
528532
tidy-html5:arm-uwp=fail

0 commit comments

Comments
 (0)