From c1342ab9d6c3f0fd69d91d8ff9f1e49961811855 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 14 Oct 2022 21:46:50 +0200 Subject: [PATCH] stop pre-installing the ndk --- buildserver/Vagrantfile | 2 +- makebuildserver | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile index f5172870..3ba5f2b7 100644 --- a/buildserver/Vagrantfile +++ b/buildserver/Vagrantfile @@ -92,7 +92,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", "r23c"] + args: ["/opt/android-sdk/ndk"] 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 4a49ce6c..be3ab9bd 100755 --- a/makebuildserver +++ b/makebuildserver @@ -129,8 +129,6 @@ CACHE_FILES = [ '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'), ('https://services.gradle.org/distributions/gradle-7.0.2-bin.zip', '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'), - ('https://dl.google.com/android/repository/android-ndk-r23c-linux.zip', - '6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242'), ]