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

Merge branch 'ndk' into 'master'

Browse source 
NDK r14b and r15b

See merge request !293
This commit is contained in:
Hans-Christoph Steiner 2017-07-04 14:34:42 +02:00
commit 6d7fd5f07c
5 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
buildserver/config.buildserver.py
View file

@ -5,7 +5,8 @@ ndk_paths = {
'r11c': "/home/vagrant/android-ndk/r11c",
'r12b': "/home/vagrant/android-ndk/r12b",
'r13b': "/home/vagrant/android-ndk/r13b",
'r14': "/home/vagrant/android-ndk/r14",
'r14b': "/home/vagrant/android-ndk/r14b",
'r15b': "/home/vagrant/android-ndk/r15b",
}
qt_sdk_path = "/home/vagrant/qt-sdk/5.7.0/5.7"
java_paths = {

11
buildserver/provision-android-ndk
View file

@ -35,9 +35,14 @@ if [ ! -e $NDK_BASE/r13b ]; then
mv android-ndk-r13b r13b
fi
if [ ! -e $NDK_BASE/r14 ]; then
unzip /vagrant/cache/android-ndk-r14-linux-x86_64.zip > /dev/null
mv android-ndk-r14 r14
if [ ! -e $NDK_BASE/r14b ]; then
unzip /vagrant/cache/android-ndk-r14b-linux-x86_64.zip > /dev/null
mv android-ndk-r14b r14b
fi
if [ ! -e $NDK_BASE/r15b ]; then
unzip /vagrant/cache/android-ndk-r15b-linux-x86_64.zip > /dev/null
mv android-ndk-r15b r15b
fi
chmod -R a+rX $NDK_BASE/