Commit ecdb2c68 authored by relan's avatar relan

makebuildserver: fix NDK r14b provisioning

Replace r14 with r14b after a57bff78.
parent 0be224b3
......@@ -5,7 +5,7 @@ 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",
}
qt_sdk_path = "/home/vagrant/qt-sdk/5.7.0/5.7"
java_paths = {
......
......@@ -35,9 +35,9 @@ 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
chmod -R a+rX $NDK_BASE/
......
......@@ -16,7 +16,7 @@
# 'r11c': None,
# 'r12b': "$ANDROID_NDK",
# 'r13b': None,
# 'r14': None,
# 'r14b': None,
# }
# Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7"
......
......@@ -74,7 +74,7 @@ default_config = {
'r11c': None,
'r12b': "$ANDROID_NDK",
'r13b': None,
'r14': None,
'r14b': None,
},
'qt_sdk_path': None,
'build_tools': "25.0.2",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment