kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

Merge branch 'master' into 'master'

Browse Source 
Update NDK to r21d and add buildtools 30.0.0

See merge request fdroid/fdroidserver!763
This commit is contained in:
Marcus 2020-06-10 20:21:26 +00:00
commit 95623361ae
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildserver/config.buildserver.py
View File

@ -11,7 +11,7 @@ ndk_paths = {
'r18b': "/home/vagrant/android-ndk/r18b",
'r19c': "/home/vagrant/android-ndk/r19c",
'r20b': "/home/vagrant/android-ndk/r20b",
'r21c': "/home/vagrant/android-ndk/r21c",
'r21d': "/home/vagrant/android-ndk/r21d",
}
java_paths = {
'8': "/usr/lib/jvm/java-8-openjdk-amd64",

2
buildserver/provision-android-ndk
View File

@ -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 r21c; do
for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21d; do
if [ ! -e ${NDK_BASE}/${version} ]; then
unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
mv android-ndk-${version} ${version}

2
examples/config.py
View File

@ -22,7 +22,7 @@
# 'r18b': None,
# 'r19c': None,
# 'r20b': None,
# 'r21c': None,
# 'r21d': None,
# }
# Directory to store downloaded tools in (i.e. gradle versions)

6
makebuildserver
View File

@ -258,6 +258,8 @@ CACHE_FILES = [
'1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08'),
('https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip',
'5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855'),
('https://dl.google.com/android/repository/build-tools_r30-linux.zip',
'ed3b7f9b2d15e90a12c2e739adb749d7d834e2f953e677380206bd14db135c6c'),
('https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
'420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
('https://services.gradle.org/distributions/gradle-2.3-bin.zip',
@ -396,8 +398,8 @@ CACHE_FILES = [
'4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'),
('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip',
'8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
('https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip',
'214ebfcfa5108ba78f5b2cc8db4d575068f9c973ac7f27d2fa1987dfdb76c9e7'),
('https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip',
'dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd'),
]