Commit 86b403b5 authored by relan's avatar relan

makebuildserver: add NDK r15b

parent ecdb2c68
......@@ -6,6 +6,7 @@ ndk_paths = {
'r12b': "/home/vagrant/android-ndk/r12b",
'r13b': "/home/vagrant/android-ndk/r13b",
'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 = {
......
......@@ -40,5 +40,10 @@ if [ ! -e $NDK_BASE/r14b ]; then
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/
find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x
......@@ -17,6 +17,7 @@
# 'r12b': "$ANDROID_NDK",
# 'r13b': None,
# 'r14b': None,
# 'r15b': None,
# }
# Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7"
......
......@@ -75,6 +75,7 @@ default_config = {
'r12b': "$ANDROID_NDK",
'r13b': None,
'r14b': None,
'r15b': None,
},
'qt_sdk_path': None,
'build_tools': "25.0.2",
......
......@@ -320,6 +320,8 @@ cachefiles = [
'3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
('https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip',
'0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
('https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip',
'd1ce63f68cd806b5a992d4e5aa60defde131c243bf523cdfc5b67990ef0ee0d3'),
('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
]
......
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