chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-add NDK r12b, now fixed.
[fdroidserver.git]
/
fdroidserver
/
build.py
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 70ad1aee6a9460afcc023aeaa98009cddeb6f27a..d02947bdb5aaa4583bfc41ce9cec5c1dc10106ce 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-460,7
+460,7
@@
def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
ndk_path = build.ndk_path()
if build.ndk or (build.buildjni and build.buildjni != ['no']):
if not ndk_path:
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 'r1
0e
')
+ logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r1
2b
')
logging.critical("Configured versions:")
for k, v in config['ndk_paths'].items():
if k.endswith("_orig"):
logging.critical("Configured versions:")
for k, v in config['ndk_paths'].items():
if k.endswith("_orig"):