From f9b853ab91230ca259bf979f48f344f397242651 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Sun, 26 Nov 2017 17:08:26 +0100 Subject: [PATCH] makebuildserver: add ndk r16 --- buildserver/config.buildserver.py | 1 + examples/config.py | 1 + fdroidserver/common.py | 1 + makebuildserver | 2 ++ 4 files changed, 5 insertions(+) diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py index 2ac78979..1ecf43ce 100644 --- a/buildserver/config.buildserver.py +++ b/buildserver/config.buildserver.py @@ -7,6 +7,7 @@ ndk_paths = { 'r13b': "/home/vagrant/android-ndk/r13b", 'r14b': "/home/vagrant/android-ndk/r14b", 'r15c': "/home/vagrant/android-ndk/r15c", + 'r16': "/home/vagrant/android-ndk/r16", } qt_sdk_path = "/home/vagrant/qt-sdk/5.7.0/5.7" java_paths = { diff --git a/examples/config.py b/examples/config.py index 82f77431..0551e1c0 100644 --- a/examples/config.py +++ b/examples/config.py @@ -18,6 +18,7 @@ # 'r13b': None, # 'r14b': None, # 'r15c': None, +# 'r16': None, # } # Path to the Qt SDK. It is of the form "/path/to/Qt5.7.0/5.7" diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 4767e211..89c1a1d5 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -80,6 +80,7 @@ default_config = { 'r13b': None, 'r14b': None, 'r15c': None, + 'r16': None, }, 'qt_sdk_path': None, 'build_tools': "25.0.2", diff --git a/makebuildserver b/makebuildserver index ac0383de..7ce2e62d 100755 --- a/makebuildserver +++ b/makebuildserver @@ -352,6 +352,8 @@ cachefiles = [ '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'), ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip', 'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'), + ('https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip', + 'a8550b81771c67cc6ab7b479a6918d29aa78de3482901762b4f9e0132cd9672e'), ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run', 'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'), ]