Add platform-24 to the buildserver

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 0f5cb86e54f6caec9f8b9cf9c0c57ca82386d01b..71adb09cb97615da3386faad232174bc91a5d8eb 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -133,6 +133,8 @@ cachefiles = [
      '45eb581bbe53c9256f34c26b2cea919543c0079140897ac721cf88c0b9f6789e'),
     ('https://dl.google.com/android/repository/platform-23_r03.zip',
      '4b4bcddead3319708275c54c76294707bfaa953d767e34f1a5b599f3edd0076c'),
+    ('https://dl.google.com/android/repository/platform-24_r01.zip',
+     '292e556e9ec84b4134e4126c835e4ac467f6950924fec3684792af0fcf426091'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -177,6 +179,8 @@ cachefiles = [
      '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
     ('https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip',
      'd961663d4a9e128841751c0156548a347c882c081c83942e53788d8949bf34e1'),
+    ('https://dl.google.com/android/repository/build-tools_r24-linux.zip',
+     'b4871f357224c5f660fd2bbee04d8c7d1c187eeddfd9702cc84503529e3b3724'),
     # 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',
@@ -292,8 +296,8 @@ for srcurl, shasum in cachefiles:
                          stream=True, verify=False, allow_redirects=True)
         content_length = int(r.headers.get('content-length'))
         with open(local_filename, 'ab') as f:
-            for chunk in progress.bar(r.iter_content(chunk_size=1024),
-                                      expected_size=(content_length / 1024) + 1):
+            for chunk in progress.bar(r.iter_content(chunk_size=65536),
+                                      expected_size=(content_length / 65536) + 1):
                 if chunk:  # filter out keep-alive new chunks
                     f.write(chunk)
 
@@ -377,10 +381,8 @@ if config['apt_package_cache']:
 
 vagrantfile += """
 
-  config.vm.provision "shell" do |shell|
-    shell.path = "setup-env-vars"
-    shell.args = ["/home/vagrant/android-sdk", "/home/vagrant/android-ndk"]
-  end
+  config.vm.provision "shell", path: "setup-env-vars",
+    args: ["/home/vagrant/android-sdk"]
 
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"
@@ -397,7 +399,8 @@ vagrantfile += """
   end
 
   config.vm.provision "shell", path: "provision-android-sdk"
-  config.vm.provision "shell", path: "provision-android-ndk"
+  config.vm.provision "shell", path: "provision-android-ndk",
+    args: ["/home/vagrant/android-ndk"]
   config.vm.provision "shell", path: "provision-gradle"
   config.vm.provision "file", source: "gradle",
     destination: "/opt/gradle/bin/gradle"