Revert "all: add NDK r12b and set it as default"

[fdroidserver.git] / examples / config.py

diff --git a/examples/config.py b/examples/config.py
index f022c2b0a76010aa5992eb0b1f444d2de671b888..97628e7e0ad8f97d394c75ac1dae9262d667716b 100644 (file)
--- a/examples/config.py
+++ b/examples/config.py
@@ -15,15 +15,16 @@
 #     'r10e': "$ANDROID_NDK",
 # }
 
-# If you want to build apps that use retrolambda and Java 1.8, you'll need to
-# have both 1.7 and 1.8 installed.
 # java_paths = {
-#     '1.7': "/usr/lib/jvm/java-7-openjdk",
-#     '1.8': None,
+#     '1.8': "/usr/lib/jvm/java-8-openjdk",
 # }
 
 # Build tools version to be used
-# build_tools = "23.0.2"
+# build_tools = "24.0.0"
+
+# Force all build to use the above version of build -tools, good for testing
+# builds without having all of the possible build-tools installed.
+# force_build_tools = True
 
 # Command or path to binary for running Ant
 # ant = "ant"
@@ -232,10 +233,10 @@ The repository of older versions of applications from the main demo repository.
 # --server option on dedicated secure build server hosts.
 # build_server_always = True
 
-# By default, fdroid will use YAML and the custom .txt metadata formats. It
+# By default, fdroid will use YAML .yml and the custom .txt metadata formats. It
 # is also possible to have metadata in JSON and XML by adding 'json' and
 # 'xml'.
-# accepted_formats = ['txt', 'yaml']
+# accepted_formats = ['txt', 'yml']
 
 # Limit in number of characters that fields can take up
 # Only the fields listed here are supported, defaults shown