From 9fc2a2371353f5a3962e8a4f833b4d3ebf958cc8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 12 May 2021 14:24:05 +0200
Subject: [PATCH] build: remove default NDK, closes #717

---
 examples/config.yml      | 10 +++++-----
 fdroidserver/build.py    |  2 +-
 fdroidserver/common.py   | 10 +---------
 fdroidserver/init.py     |  1 -
 fdroidserver/metadata.py |  8 +-------
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/examples/config.yml b/examples/config.yml
index 36a66c22..ee62c9ac 100644
--- a/examples/config.yml
+++ b/examples/config.yml
@@ -5,14 +5,14 @@
 # Custom path to the Android SDK, defaults to $ANDROID_HOME
 # sdk_path: $ANDROID_HOME
 
-# Custom paths to various versions of the Android NDK, defaults to 'r12b' set
-# to $ANDROID_NDK. Most users will have the latest at $ANDROID_NDK, which is
-# used by default. If a version is missing or assigned to None, it is assumed
-# not installed.
+# Paths to various installed versions of the Android NDK.  If a
+# required version is missing in the buildserver VM, it will be
+# automatically downloaded and installed into a temporary dir.
+#
 # ndk_paths:
 #   r10e: None
 #   r11c: None
-#   r12b: $ANDROID_NDK
+#   r12b: None
 #   r13b: None
 #   r14b: None
 #   r15c: None
diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 3e0b2243..efe7ab3f 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -361,7 +361,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
     ndk_path = build.ndk_path()
     if build.ndk or (build.buildjni and build.buildjni != ['no']):
         if not ndk_path:
-            logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b')
+            logging.critical("Android NDK version '%s' could not be found!" % build.ndk)
             logging.critical("Configured versions:")
             for k, v in config['ndk_paths'].items():
                 if k.endswith("_orig"):
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 1194402e..fba87e99 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -118,15 +118,7 @@ orig_path = None
 
 default_config = {
     'sdk_path': "$ANDROID_HOME",
-    'ndk_paths': {
-        'r10e': None,
-        'r11c': None,
-        'r12b': "$ANDROID_NDK",
-        'r13b': None,
-        'r14b': None,
-        'r15c': None,
-        'r16b': None,
-    },
+    'ndk_paths': {},
     'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
     'java_paths': None,
     'scan_binary': False,
diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index e66d4daa..c1230d9c 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -226,7 +226,6 @@ def main():
     msg = '\n'
     msg += _('Built repo based in "%s" with this config:') % fdroiddir
     msg += '\n\n  Android SDK:\t\t\t' + config['sdk_path']
-    msg += '\n  Android NDK r12b (optional):\t$ANDROID_NDK'
     msg += '\n  ' + _('Keystore for signing key:\t') + keystore
     if repo_keyalias is not None:
         msg += '\n  Alias for key in store:\t' + repo_keyalias
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 597c4cd2..b72d6c9d 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -326,13 +326,7 @@ class Build(dict):
         return 'ant'
 
     def ndk_path(self):
-        version = self.ndk
-        if not version:
-            version = 'r12b'  # falls back to latest
-        paths = fdroidserver.common.config['ndk_paths']
-        if version not in paths:
-            return ''
-        return paths[version]
+        return fdroidserver.common.config['ndk_paths'].get(self.ndk, '')
 
 
 flagtypes = {