From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 18 Jul 2016 14:50:51 +0000 (+0000)
Subject: Merge branch 'ndk-r12' into 'master'
X-Git-Tag: 0.7.0~29
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9be1c75e586658349e61d993f2e47c671d7bda5b;p=fdroidserver.git

Merge branch 'ndk-r12' into 'master'

NDK r12



See merge request !147
---

9be1c75e586658349e61d993f2e47c671d7bda5b
diff --cc fdroidserver/build.py
index 70ad1aee,fbdfbf8d..d02947bd
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -458,9 -458,9 +458,9 @@@ def build_local(app, build, vcs, build_
      """Do a build locally."""
  
      ndk_path = build.ndk_path()
 -    if build.buildjni and build.buildjni != ['no']:
 +    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 'r10e')
+             logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b')
              logging.critical("Configured versions:")
              for k, v in config['ndk_paths'].items():
                  if k.endswith("_orig"):