Merge branch 'push-install' into 'master'

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 461eb2f0cdea779cdfeac1b5e4a7eb0bc56098c1..bd9a46a0b8a3eacce1391c4ce558f90fab041123 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!')
@@ -94,8 +95,8 @@ if config['apt_package_cache']:
 cachefiles = [
     ('https://dl.google.com/android/repository/tools_r25.1.7-linux.zip',
      '3ca053600a86a5a64d5571edfbb1dad27f2bda3bfd2d38e2fe54322610b1ef0b'),
-    ('https://dl.google.com/android/repository/android_m2repository_r33.zip',
-     'be9bb4a27aeefb1c9adb0cade8771f764447c4cbde74426303db2ac6bde1879c'),
+    ('https://dl.google.com/android/repository/android_m2repository_r35.zip',
+     '2fdfe9a4dff87ee8129d9fc1ed78c242e87f9c0b4d92ad1437b5fde6de1e634c'),
     ('https://dl.google.com/android/repository/android-1.5_r04-linux.zip',
      '85b6c8f9797e56aa415d3a282428bb640c96b0acb17c11d41621bb2a5302fe64'),
     ('https://dl.google.com/android/repository/android-1.6_r03-linux.zip',
@@ -186,6 +187,8 @@ cachefiles = [
      'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
     ('https://dl.google.com/android/repository/build-tools_r24-linux.zip',
      'b4871f357224c5f660fd2bbee04d8c7d1c187eeddfd9702cc84503529e3b3724'),
+    ('https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip',
+     '5b58478f8ce0a87512b7894f8fc2588249304a041bb3a2a70259f2a3d17c8c0a'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -234,6 +237,8 @@ cachefiles = [
      '0f665ec6a5a67865faf7ba0d825afb19c26705ea0597cec80dd191b0f2cbb664'),
     ('https://services.gradle.org/distributions/gradle-2.14-bin.zip',
      '993b4f33b652c689e9721917d8e021cab6bbd3eae81b39ab2fd46fdb19a928d5'),
+    ('https://services.gradle.org/distributions/gradle-2.14.1-bin.zip',
+     'cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39'),
     ('https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
@@ -242,6 +247,8 @@ 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-r11c-linux-x86_64.zip',
+     'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
     ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
      'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
 ]