mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ndk-r16b' into 'master'

Browse source 
makebuildserver: upgrade NDK r16 to r16b

See merge request fdroid/fdroidserver!458
This commit is contained in:
Hans-Christoph Steiner 2018-02-12 10:54:31 +00:00
commit 8326e62235
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/config.buildserver.py
View file

@ -7,7 +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",
'r16b': "/home/vagrant/android-ndk/r16b",
}
java_paths = {
'8': "/usr/lib/jvm/java-8-openjdk-amd64",

2
examples/config.py
View file

@ -18,7 +18,7 @@
# 'r13b': None,
# 'r14b': None,
# 'r15c': None,
# 'r16': None,
# 'r16b': None,
# }
# java_paths = {

2
fdroidserver/common.py
View file

@ -84,7 +84,7 @@ default_config = {
'r13b': None,
'r14b': None,
'r15c': None,
'r16': None,
'r16b': None,
},
'build_tools': MINIMUM_AAPT_VERSION,
'force_build_tools': False,

4
makebuildserver
View file

@ -367,8 +367,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://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip',
'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
]