mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'ndk-r22b' into 'master'
makebuildserver: upgrade NDK r22 to r22b See merge request fdroid/fdroidserver!899
This commit is contained in:
commit
234dc9b402
@ -12,7 +12,7 @@ ndk_paths:
|
||||
r19c: /home/vagrant/android-ndk/r19c
|
||||
r20b: /home/vagrant/android-ndk/r20b
|
||||
r21e: /home/vagrant/android-ndk/r21e
|
||||
r22: /home/vagrant/android-ndk/r22
|
||||
r22b: /home/vagrant/android-ndk/r22b
|
||||
|
||||
java_paths:
|
||||
8: /usr/lib/jvm/java-8-openjdk-amd64
|
||||
|
@ -15,7 +15,7 @@ if [ ! -e $NDK_BASE/r10e ]; then
|
||||
mv android-ndk-r10e r10e
|
||||
fi
|
||||
|
||||
for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21e r22; do
|
||||
for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21e r22b; do
|
||||
if [ ! -e ${NDK_BASE}/${version} ]; then
|
||||
unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
|
||||
mv android-ndk-${version} ${version}
|
||||
|
@ -22,7 +22,7 @@
|
||||
# r19c: None
|
||||
# r20b: None
|
||||
# r21e: None
|
||||
# r22: None
|
||||
# r22b: None
|
||||
|
||||
# Directory to store downloaded tools in (i.e. gradle versions)
|
||||
# By default, these are stored in ~/.cache/fdroidserver
|
||||
|
@ -309,8 +309,8 @@ CACHE_FILES = [
|
||||
'8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
|
||||
('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip',
|
||||
'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e'),
|
||||
('https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip',
|
||||
'd37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718'),
|
||||
('https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip',
|
||||
'ac3a0421e76f71dd330d0cd55f9d99b9ac864c4c034fc67e0d671d022d4e806b'),
|
||||
]
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user