From 24e1e195255a2f7af4cc73affa6616e3b41a0a4f Mon Sep 17 00:00:00 2001 From: Hajime Tazaki Date: Wed, 19 Feb 2025 08:06:29 +0900 Subject: [PATCH 1/2] android: bump up android ndk version This is needed to support preadv/pwritev calls, which is available after Bionic API level 24. Link: https://github.com/lkl/linux/pull/563 Signed-off-by: Hajime Tazaki --- circleci/android/arm64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circleci/android/arm64/Dockerfile b/circleci/android/arm64/Dockerfile index e86fd6d..10abae4 100644 --- a/circleci/android/arm64/Dockerfile +++ b/circleci/android/arm64/Dockerfile @@ -4,7 +4,7 @@ FROM $IMAGE_NAME LABEL authors="Hajime Tazaki , Octavian Purdila " # install toolchain from NDK -RUN ./android-ndk-r15b/build/tools/make_standalone_toolchain.py --arch arm64 --api 23 --install-dir ./aarch64-linux-android && \ +RUN ./android-ndk-r15b/build/tools/make_standalone_toolchain.py --arch arm64 --api 24 --install-dir ./aarch64-linux-android && \ rm -rf android-ndk-r15b # update toolchain, see https://github.com/lkl/linux/issues/348#issuecomment-312409409 From 9b9bed84a91883d8d0d761990256113cda9d3631 Mon Sep 17 00:00:00 2001 From: Hajime Tazaki Date: Wed, 19 Feb 2025 08:22:07 +0900 Subject: [PATCH 2/2] x86_64: remove specific version from linux-headers package Signed-off-by: Hajime Tazaki --- circleci/x86_64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circleci/x86_64/Dockerfile b/circleci/x86_64/Dockerfile index 6b834fe..d44ca84 100644 --- a/circleci/x86_64/Dockerfile +++ b/circleci/x86_64/Dockerfile @@ -4,5 +4,5 @@ FROM $IMAGE_NAME LABEL authors="Hajime Tazaki , Octavian Purdila " RUN sudo apt-get update && \ - sudo apt-get install -y libfuse-dev libarchive-dev linux-headers-4.4.0-97-generic valgrind libnuma-dev && \ + sudo apt-get install -y libfuse-dev libarchive-dev linux-headers-generic valgrind libnuma-dev && \ sudo rm -rf /var/lib/apt/lists/*