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

Revert "Merge branch 'ndk21' into 'master'"

Browse Source 
This reverts commit 9b4cb8b76a, reversing
changes made to 3bdbbfd45b.
This commit is contained in:
Marcus Hoffmann 2020-01-15 22:09:41 +01:00
parent 9b4cb8b76a
commit 999b15a909
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildserver/config.buildserver.py
View File

@ -11,7 +11,6 @@ ndk_paths = {
'r18b': "/home/vagrant/android-ndk/r18b", 'r18b': "/home/vagrant/android-ndk/r18b",
'r19c': "/home/vagrant/android-ndk/r19c", 'r19c': "/home/vagrant/android-ndk/r19c",
'r20b': "/home/vagrant/android-ndk/r20b", 'r20b': "/home/vagrant/android-ndk/r20b",
'r21': "/home/vagrant/android-ndk/r21",
} }
java_paths = { java_paths = {
'8': "/usr/lib/jvm/java-8-openjdk-amd64", '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 mv android-ndk-r10e r10e
fi fi
for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b r21; do for version in r11c r12b r13b r14b r15c r16b r17c r18b r19c r20b; do
if [ ! -e ${NDK_BASE}/${version} ]; then if [ ! -e ${NDK_BASE}/${version} ]; then
unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
mv android-ndk-${version} ${version} mv android-ndk-${version} ${version}

1
examples/config.py
View File

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

2
makebuildserver
View File

@ -384,8 +384,6 @@ CACHE_FILES = [
'4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'), '4c62514ec9c2309315fd84da6d52465651cdb68605058f231f1e480fcf2692e1'),
('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip', ('https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip',
'8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'), '8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c'),
('https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip',
'b65ea2d5c5b68fb603626adcbcea6e4d12c68eb8a73e373bbb9d23c252fc647b'),
] ]