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

Merge branch 'ndk-r12' into 'master'

Browse source 
NDK r12



See merge request !147
This commit is contained in:
Hans-Christoph Steiner 2016-07-18 14:50:51 +00:00
commit 9be1c75e58
10 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docs/fdroid.texi
View file

@ -1125,9 +1125,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
toolchains no longer included in current versions of the NDK.
The buildserver supports r9b with its legacy toolchains and the latest release
as of writing this document, r10e. You may add support for more versions by
adding them to 'ndk_paths' in your config file.
The buildserver supports r9b with its legacy toolchains, r10e and the
latest release as of writing this document, r12b. You may add support
for more versions by adding them to 'ndk_paths' in your config file.
@item gradle=<flavour1>[,<flavour2>,...]
Build with Gradle instead of Ant, specifying what flavours to use. Flavours
@ -1561,9 +1561,7 @@ applications.
@section Setting up a build server
In addition to the basic setup previously described, you will also need
a Vagrant-compatible Debian Testing base box called 'jessie32' (or jessie64
for a 64-bit VM, if you want it to be much slower, and require more disk
space).
a Vagrant-compatible Debian Testing base box called 'jessie64'.
You can use a different version or distro for the base box, so long as you
don't expect any help making it work. One thing to be aware of is that