kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-14 13:00:08 +02:00
Code Activity

Add ndk 13b

Browse Source
This commit is contained in:
est31 2016-11-25 21:10:44 +01:00
parent d7ec321198
commit ddefec33cd
6 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildserver/config.buildserver.py
View File

@ -4,6 +4,7 @@ ndk_paths = {
'r10e': "/home/vagrant/android-ndk/r10e", 'r10e': "/home/vagrant/android-ndk/r10e",
'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",
} }
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 = {

5
buildserver/provision-android-ndk
View File

@ -30,5 +30,10 @@ if [ ! -e $NDK_BASE/r12b ]; then
mv android-ndk-r12b r12b mv android-ndk-r12b r12b
fi fi
if [ ! -e $NDK_BASE/r13b ]; then
unzip /vagrant/cache/android-ndk-r13b-linux-x86_64.zip > /dev/null
mv android-ndk-r13b r13b
fi
chmod -R a+rX $NDK_BASE/ chmod -R a+rX $NDK_BASE/
find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x find $NDK_BASE/ -type f -executable -print0 | xargs -0 chmod a+x

6
docs/fdroid.texi
View File

@ -1122,9 +1122,9 @@ Version of the NDK to use in this build. Defaults to the latest NDK release
that included legacy toolchains, so as to not break builds that require that included legacy toolchains, so as to not break builds that require
toolchains no longer included in current versions of the NDK. toolchains no longer included in current versions of the NDK.
The buildserver supports r9b with its legacy toolchains, r10e, r11c and the The buildserver supports r9b with its legacy toolchains, r10e, r11c, r12b,
latest release as of writing this document, r12b. You may add support and the latest release as of writing this document, r13b. You may add
for more versions by adding them to 'ndk_paths' in your config file. support for more versions by adding them to 'ndk_paths' in your config file.
@item gradle=<flavour1>[,<flavour2>,...] @item gradle=<flavour1>[,<flavour2>,...]
Build with Gradle instead of Ant, specifying what flavours to use. Flavours Build with Gradle instead of Ant, specifying what flavours to use. Flavours

1
examples/config.py
View File

@ -15,6 +15,7 @@
# 'r10e': None, # 'r10e': None,
# 'r11c': None, # 'r11c': None,
# 'r12b': "$ANDROID_NDK", # 'r12b': "$ANDROID_NDK",
# 'r13b': 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"

1
fdroidserver/common.py
View File

@ -59,6 +59,7 @@ default_config = {
'r10e': None, 'r10e': None,
'r11c': None, 'r11c': None,
'r12b': "$ANDROID_NDK", 'r12b': "$ANDROID_NDK",
'r13b': None,
}, },
'qt_sdk_path': None, 'qt_sdk_path': None,
'build_tools': "25.0.0", 'build_tools': "25.0.0",

2
makebuildserver
View File

@ -291,6 +291,8 @@ cachefiles = [
'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'), 'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip', ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'), 'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
('https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip',
'3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
('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'),
] ]