From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 4 Jul 2017 12:34:42 +0000 (+0200)
Subject: Merge branch 'ndk' into 'master'
X-Git-Tag: 0.8~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6d7fd5f07c5dabe6ce2cd7bb509f772a932496c3;hp=-c;p=fdroidserver.git

Merge branch 'ndk' into 'master'

NDK r14b and r15b

See merge request !293
---

6d7fd5f07c5dabe6ce2cd7bb509f772a932496c3
diff --combined fdroidserver/common.py
index 875e43a3,f84ea0f1..c8fdaad5
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -74,7 -74,8 +74,8 @@@ default_config = 
          'r11c': None,
          'r12b': "$ANDROID_NDK",
          'r13b': None,
-         'r14': None,
+         'r14b': None,
+         'r15b': None,
      },
      'qt_sdk_path': None,
      'build_tools': "25.0.2",
@@@ -397,8 -398,8 +398,8 @@@ def get_local_metadata_files()
  
  def read_pkg_args(args, allow_vercodes=False):
      """
 -    Given the arguments in the form of multiple appid:[vc] strings, this returns
 -    a dictionary with the set of vercodes specified for each package.
 +    :param args: arguments in the form of multiple appid:[vc] strings
 +    :returns: a dictionary with the set of vercodes specified for each package
      """
  
      vercodes = {}