Check javac existence when looking for JDK

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 2397fb4b30b132b93a3136297c90fc5c7d19192b..6a4793f24164ae76971d467303d704c0ea851333 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -71,7 +71,8 @@ if os.path.exists('makebuildserver.config.py'):
 elif os.path.exists('makebs.config.py'):
     # this is the old name for the config file
     exec(compile(open('makebs.config.py').read(), 'makebs.config.py', 'exec'), config)
-del(config['__builtins__'])  # added by compile/exec
+if '__builtins__' in config:
+    del(config['__builtins__'])  # added by compile/exec
 
 if not os.path.exists('makebuildserver') or not os.path.exists(serverdir):
     print('This must be run from the correct directory!')
@@ -244,8 +245,6 @@ cachefiles = [
      '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
      'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
-    ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
-     'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
 ]