Merge branch 'master' into 'master'

NDK fixups

See merge request fdroid/fdroidserver!929

buildserver/provision-android-sdk

@@ -122,6 +122,7 @@ echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;sup
 echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
 echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
 
+chmod a+X $(dirname $ANDROID_HOME/)
 chmod -R a+rX $ANDROID_HOME/
 chgrp vagrant $ANDROID_HOME
 chmod g+w $ANDROID_HOME

fdroidserver/build.py

@@ -361,12 +361,12 @@ 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)
-            logging.critical("Configured versions:")
+            logging.warning("Android NDK version '%s' could not be found!" % build.ndk)
+            logging.warning("Configured versions:")
             for k, v in config['ndk_paths'].items():
                 if k.endswith("_orig"):
                     continue
-                logging.critical("  %s: %s" % (k, v))
+                logging.warning("  %s: %s" % (k, v))
             if onserver:
                 common.auto_install_ndk(build)
             else:

fdroidserver/common.py

@@ -224,7 +224,10 @@ def fill_config_defaults(thisconfig):
     """
     for k, v in default_config.items():
         if k not in thisconfig:
-            thisconfig[k] = v
+            if isinstance(v, dict) or isinstance(v, list):
+                thisconfig[k] = v.copy()
+            else:
+                thisconfig[k] = v
 
     # Expand paths (~users and $vars)
     def expand_path(path):

makebuildserver

@@ -281,14 +281,8 @@ CACHE_FILES = [
      '565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4'),
     ('https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip',
      '24593500aa95d2f99fb4f10658aae7e65cb519be6cd33fa164f15f27f3c4a2d6'),
-    ('https://services.gradle.org/distributions/gradle-6.8.2-bin.zip',
-     '8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610'),
     ('https://services.gradle.org/distributions/gradle-6.8.3-bin.zip',
      '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'),
-    ('https://services.gradle.org/distributions/gradle-7.0-bin.zip',
-     'eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305'),
-    ('https://services.gradle.org/distributions/gradle-7.0.1-bin.zip',
-     'dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb'),
     ('https://services.gradle.org/distributions/gradle-7.0.2-bin.zip',
      '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'),
     ('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip',

tests/ndk-release-checksums.py

@@ -131,7 +131,7 @@ if git_repo.is_dirty() and 'fdroidserver/common.py' in modified:
             'source_branch': branch.name,
             'target_project_id': 36527,  # fdroid/fdroidserver
             'target_branch': 'master',
-            'title': 'update to gradle v' + version,
+            'title': 'update NDK',
             'description': description,
             'labels': ['fdroid-bot', 'buildserver'],
             'remove_source_branch': True,