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

makebuildserver: fix NDK r14b provisioning

Browse source 
Replace r14 with r14b after a57bff7.
This commit is contained in:
relan 2017-07-04 10:46:52 +03:00
parent 0be224b3e0
commit ecdb2c685a
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/config.buildserver.py
View file

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

6
buildserver/provision-android-ndk
View file

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

2
examples/config.py
View file

@ -16,7 +16,7 @@
# 'r11c': None, # 'r11c': None,
# 'r12b': "$ANDROID_NDK", # 'r12b': "$ANDROID_NDK",
# 'r13b': None, # 'r13b': None,
# 'r14': None, # 'r14b': None,
# } # }
# Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7" # Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7"

2
fdroidserver/common.py
View file

@ -74,7 +74,7 @@ default_config = {
'r11c': None, 'r11c': None,
'r12b': "$ANDROID_NDK", 'r12b': "$ANDROID_NDK",
'r13b': None, 'r13b': None,
'r14': None, 'r14b': None,
}, },
'qt_sdk_path': None, 'qt_sdk_path': None,
'build_tools': "25.0.2", 'build_tools': "25.0.2",