all: add NDK r12b and set it as default

[fdroidserver.git] / fdroidserver / init.py

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 4b301de90addcc231094ac3da2cac1fad891b6db..f29b2d53891057e33bf117363c177092f677865f 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -35,12 +35,12 @@ options = None
 
 def disable_in_config(key, value):
     '''write a key/value to the local config.py, then comment it out'''
-    with open('config.py', 'r') as f:
+    with open('config.py', 'r', encoding='utf8') as f:
         data = f.read()
     pattern = '\n[\s#]*' + key + '\s*=\s*"[^"]*"'
     repl = '\n#' + key + ' = "' + value + '"'
     data = re.sub(pattern, repl, data)
-    with open('config.py', 'w') as f:
+    with open('config.py', 'w', encoding='utf8') as f:
         f.writelines(data)
 
 
@@ -235,7 +235,7 @@ def main():
     logging.info('  Android SDK:\t\t\t' + config['sdk_path'])
     if aapt:
         logging.info('  Android SDK Build Tools:\t' + os.path.dirname(aapt))
-    logging.info('  Android NDK r10e (optional):\t$ANDROID_NDK')
+    logging.info('  Android NDK r12b (optional):\t$ANDROID_NDK')
     logging.info('  Keystore for signing key:\t' + keystore)
     if repo_keyalias is not None:
         logging.info('  Alias for key in store:\t' + repo_keyalias)