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

Merge branch 'ndk11' into 'master'

Browse source 
Add ndk r11c

NDK11 is required by some apps (some versions of VLC) which will not build with r10e or r12b. As always, please test this before merging: I havent added a NDK before.

See merge request !155
This commit is contained in:
Daniel Martí 2016-08-14 09:15:04 +00:00
commit 329e0247d5
6 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
buildserver/config.buildserver.py
View file

@ -2,6 +2,7 @@ sdk_path = "/home/vagrant/android-sdk"
ndk_paths = {
'r9b': "/home/vagrant/android-ndk/r9b",
'r10e': "/home/vagrant/android-ndk/r10e",
'r11c': "/home/vagrant/android-ndk/r11c",
'r12b': "/home/vagrant/android-ndk/r12b",
}
java_paths = {

5
buildserver/provision-android-ndk
View file

@ -20,6 +20,11 @@ if [ ! -e $NDK_BASE/r10e ]; then
mv android-ndk-r10e r10e
fi
if [ ! -e $NDK_BASE/r11c ]; then
unzip /vagrant/cache/android-ndk-r11c-linux-x86_64.zip > /dev/null
mv android-ndk-r11c r11c
fi
if [ ! -e $NDK_BASE/r12b ]; then
unzip /vagrant/cache/android-ndk-r12b-linux-x86_64.zip > /dev/null
mv android-ndk-r12b r12b