mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-12 10:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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