kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

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
Show Stats 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", '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",
'r15b': "/home/vagrant/android-ndk/r15b",
} }
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 = {

11
buildserver/provision-android-ndk
View File

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

3
examples/config.py
View File

@ -16,7 +16,8 @@
# 'r11c': None, # 'r11c': None,
# 'r12b': "$ANDROID_NDK", # 'r12b': "$ANDROID_NDK",
# 'r13b': None, # 'r13b': None,
# 'r14': None, # 'r14b': None,
# 'r15b': 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"

3
fdroidserver/common.py
View File

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

2
makebuildserver
View File

@ -320,6 +320,8 @@ cachefiles = [
'3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'), '3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
('https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip', ('https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip',
'0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'), '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', ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'), 'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
] ]