From ad25766aefb5313b6bc4e2a4b78a2946f84fbf66 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 8 Jun 2024 19:54:48 +0200 Subject: [PATCH] Add NDK r26 to CI image (#38975) --- scripts/azure-pipelines/android/Dockerfile | 5 ++++- scripts/azure-pipelines/azure-pipelines.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 826a532cc6..5a935697ef 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:focal-20240427 +FROM ubuntu:focal-20240530 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip +ADD https://dl.google.com/android/repository/android-ndk-r26d-linux.zip /android-ndk-r26d-linux.zip # Add apt packages @@ -62,6 +63,8 @@ apt-get -y --no-install-recommends install $APT_PACKAGES # Android NDK unzip /android-ndk-r25c-linux.zip rm -f android-ndk-r25c-linux.zip +unzip /android-ndk-r26d-linux.zip +rm -f android-ndk-r26d-linux.zip END_OF_SCRIPT ENV ANDROID_NDK_HOME /android-ndk-r25c diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 1313d94497..e1fcdb7215 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-05-17' + linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-06-07' parameters: - name: vcpkgToolSha