From ee897625ff84104a91324eb4f9b0f0c2abc6ee0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 6 Dec 2024 15:52:23 +0100 Subject: [PATCH 1/5] Update dockerfile base to ubuntu 24.04 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index da9f2c5..f55a1d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive From 0050eca020cac84761762a654bbf5047d66ee98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 6 Dec 2024 15:54:02 +0100 Subject: [PATCH 2/5] Update NDK to r27c --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f55a1d7..17eb00f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,11 @@ RUN \ # Download Android NDK RUN \ - wget https://dl.google.com/android/repository/android-ndk-r26c-linux.zip && \ - unzip android-ndk-r26c-linux.zip && \ - rm -rf android-ndk-r26c-linux.zip + wget https://dl.google.com/android/repository/android-ndk-r27c-linux.zip && \ + unzip android-ndk-r27c-linux.zip && \ + rm -rf android-ndk-r27c-linux.zip -ENV ANDROID_NDK_HOME /android-ndk-r26c +ENV ANDROID_NDK_HOME /android-ndk-r27c RUN git clone https://github.com/microsoft/vcpkg WORKDIR vcpkg From 295cb7fa32e075ea2a265c39c2645a4116a58f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 6 Dec 2024 15:49:34 +0100 Subject: [PATCH 3/5] Add armv7 package --- .github/workflows/blank.yml | 2 +- arm-android-dynamic.cmake | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arm-android-dynamic.cmake diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index 762d12d..05b2853 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - arch: [arm64, x64] + arch: [arm, arm64, x64] steps: - uses: actions/checkout@v4 - name: Download All Artifacts diff --git a/arm-android-dynamic.cmake b/arm-android-dynamic.cmake new file mode 100644 index 0000000..0e0ff2a --- /dev/null +++ b/arm-android-dynamic.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON) From 3d8a6a458337bb6389a343a460474e6ec6737c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 6 Dec 2024 15:55:05 +0100 Subject: [PATCH 4/5] Include armv7 vcpkg triplet in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 17eb00f..aacd455 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN git clone https://github.com/microsoft/vcpkg WORKDIR vcpkg RUN ./bootstrap-vcpkg.sh -COPY arm64-android-dynamic.cmake x64-android-dynamic.cmake /vcpkg/triplets/ +COPY arm-android-dynamic.cmake arm64-android-dynamic.cmake x64-android-dynamic.cmake /vcpkg/triplets/ ENV PATH "/vcpkg:$PATH" ENV VCPKG_ROOT "/vcpkg" From 9b8bb94b66a93ce10181b19a1875d9b8077cce9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 6 Dec 2024 16:35:18 +0100 Subject: [PATCH 5/5] Update vcpkg baseline --- project/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/vcpkg.json b/project/vcpkg.json index aa28afc..3458ebf 100644 --- a/project/vcpkg.json +++ b/project/vcpkg.json @@ -11,5 +11,5 @@ "sdl2", "speexdsp" ], - "builtin-baseline": "07635428f03ddcc11d775f365aaee0b7120730a2" + "builtin-baseline": "14542c8ad9b6bcb9da755884ab823605c3300b68" }