From 5472cf88b859ffac56dd98fe928e8c14d56e53b4 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Tue, 14 Jun 2022 11:03:42 +0000 Subject: [PATCH] Update preinstalled NDK to r23c --- buildserver/Vagrantfile | 3 +-- makebuildserver | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile index 09fed05d..5a420b62 100644 --- a/buildserver/Vagrantfile +++ b/buildserver/Vagrantfile @@ -1,4 +1,3 @@ - require 'yaml' require 'pathname' @@ -84,7 +83,7 @@ Vagrant.configure("2") do |config| args: [configfile['debian_mirror']] config.vm.provision "shell", name: "android-sdk", path: "provision-android-sdk" config.vm.provision "shell", name: "android-ndk", path: "provision-android-ndk", - args: ["/opt/android-sdk/ndk", "r23b"] + args: ["/opt/android-sdk/ndk", "r23c"] config.vm.provision "shell", name: "gradle", path: "provision-gradle" config.vm.provision "shell", name: "disable-analytics", path: "provision-disable-analytics" config.vm.provision "shell", name: "buildserverid", path: "provision-buildserverid", diff --git a/makebuildserver b/makebuildserver index 1c419872..b8926f95 100755 --- a/makebuildserver +++ b/makebuildserver @@ -302,8 +302,8 @@ CACHE_FILES = [ '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'), ('https://services.gradle.org/distributions/gradle-7.0.2-bin.zip', '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'), - ('https://dl.google.com/android/repository/android-ndk-r23b-linux.zip', - 'c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382'), + ('https://dl.google.com/android/repository/android-ndk-r23c-linux.zip', + '6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242'), ]