Update buildserver for android-23

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 48c9c920b14c7dba3768769ec0507fe2958c4316..3331b849e7cabed6694b20b49b97dc2ff3b2f027 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -8,7 +8,7 @@ script "setup-android-sdk" do
   user user
   cwd "/tmp"
   code "
-    tar zxvf /vagrant/cache/android-sdk_r24.3.3-linux.tgz
+    tar zxvf /vagrant/cache/android-sdk_r24.3.4-linux.tgz
     mv android-sdk-linux #{sdk_loc}
     #{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
     #{sdk_loc}/tools/android update sdk --no-ui -t tool
@@ -26,7 +26,7 @@ end
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "22.0.1"
+  ver = "23.0.0"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
@@ -67,7 +67,7 @@ end
 %w{android-3 android-4 android-5 android-6 android-7 android-8 android-9
    android-10 android-11 android-12 android-13 android-14 android-15
    android-16 android-17 android-18 android-19 android-20 android-21
-   android-22
+   android-22 android-23
    extra-android-support extra-android-m2repository}.each do |sdk|
 
   script "add_sdk_#{sdk}" do

diff --git a/makebuildserver b/makebuildserver
index 1a7f2475c900ead6440a5935216ccae0e6c12251..dd62da8cd26c354e8d9594988afd7e8fab8cc7f0 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -62,9 +62,9 @@ if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 
 cachefiles = [
-    ('android-sdk_r24.3.3-linux.tgz',
-     'https://dl.google.com/android/android-sdk_r24.3.3-linux.tgz',
-     'a05023aaf149d40a0a848ad49d5c6b43ec730443efb89d1dfa584a132a642bdf'),
+    ('android-sdk_r24.3.4-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r24.3.4-linux.tgz',
+     '886412375d8fe6e49a1583e57a8a36a47943666da681701ba9ad1ab7236e83ea'),
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),