makebuildserver: change mem default 2 GB

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index dea15f669ab39a1b34bf1aff19ed307c4e7d55ba..08f07d0afcabb389e802f034ea9194e625adec02 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -67,7 +67,7 @@ config = {
     'boot_timeout': 600,
     'cachedir': cachedir,
     'cpus': 1,
-    'memory': 1024,
+    'memory': 2048,
     'hwvirtex': 'off',
     'vm_provider': 'virtualbox',
 }
@@ -124,6 +124,9 @@ if config['apt_package_cache']:
         shutil.rmtree(aptcachepartial)
 
 cachefiles = [
+    # Don't update sdk tools beyond 25.2.5.
+    # Support for android update project has been removed and there is no replacement.
+    # Until we find a solution for that we need to stay at this revision.
     ('https://dl.google.com/android/repository/tools_r25.2.5-linux.zip',
      '577516819c8b5fae680f049d39014ff1ba4af870b687cab10595783e6f22d33e'),
     ('https://dl.google.com/android/repository/android_m2repository_r47.zip',
@@ -240,6 +243,8 @@ cachefiles = [
      '7422682f92fb471d4aad4c053c9982a9a623377f9d5e4de7a73cd44ebf2f3c61'),
     ('https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip',
      'c8617f25a7de2aeb9ddcacf1aeb413e053d5ed5ef4a3f31fe0ce21d4428ee0ea'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip',
+     'a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce'),
     # 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',
@@ -316,6 +321,10 @@ cachefiles = [
      '79ac421342bd11f6a4f404e0988baa9c1f5fabf07e3c6fa65b0c15c1c31dda22'),
     ('https://services.gradle.org/distributions/gradle-4.1-bin.zip',
      'd55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43'),
+    ('https://services.gradle.org/distributions/gradle-4.2-bin.zip',
+     '515dd63d32e55a9c05667809c5e40a947529de3054444ad274b3b75af5582eae'),
+    ('https://downloads.gradle.org/distributions/gradle-4.2.1-bin.zip',
+     'b551cc04f2ca51c78dd14edb060621f0e5439bdfafa6fd167032a09ac708fbc0'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',