From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 12 Feb 2018 10:55:02 +0000 (+0000)
Subject: Merge branch 'remove-ndk-r9b' into 'master'
X-Git-Tag: 1.0.1~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ef9b89f4ec29a66bcd38a557a639c9473a94af19;p=fdroidserver.git

Merge branch 'remove-ndk-r9b' into 'master'

makebuildserver: remove NDK r9b to save 1.6 GB of disk space

See merge request fdroid/fdroidserver!459
---

ef9b89f4ec29a66bcd38a557a639c9473a94af19
diff --cc makebuildserver
index 2fd51b18,1f8ad924..20cc386c
--- a/makebuildserver
+++ b/makebuildserver
@@@ -349,14 -349,8 +349,10 @@@ cachefiles = 
       'e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389'),
      ('https://downloads.gradle.org/distributions/gradle-4.5-bin.zip',
       '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
 +    ('https://downloads.gradle.org/distributions/gradle-4.5.1-bin.zip',
 +     '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e'),
      ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
       '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
-     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
-      '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
-     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-      'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
      ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
       'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
      ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',