chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'java-home-lookup' into 'master'
[fdroidserver.git]
/
fdroidserver
/
common.py
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index a9a4b48773497ce25deb45e8ec841f654ed92365..593bab2da947abc1686dbea301066fc5a10c3754 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-56,9
+56,10
@@
default_config = {
'sdk_path': "$ANDROID_HOME",
'ndk_paths': {
'r9b': None,
- 'r10e': "$ANDROID_NDK",
+ 'r10e': None,
+ 'r12b': "$ANDROID_NDK",
},
- 'build_tools': "24.0.
0
",
+ 'build_tools': "24.0.
1
",
'force_build_tools': False,
'java_paths': None,
'ant': "ant",