Update android sdk version

Install version 25 now. Also use the smaller tools zip. While at it,
also remove the tools re-install - it's not worth it, as long as we keep
the initial tools zip up to date.

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 7e76930b8289b985e9376e22a81b467646a32875..40105a0142f6026b8d5359aa978307fedfb2130f 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -8,8 +8,11 @@ script "setup-android-sdk" do
   user user
   cwd "/tmp"
   code "
-    tar zxvf /vagrant/cache/android-sdk_r24.4.1-linux.tgz
-    mv android-sdk-linux #{sdk_loc}
+    unzip /vagrant/cache/android-sdk-tools.zip
+    mkdir #{sdk_loc}
+    mkdir #{sdk_loc}/platforms
+    mkdir #{sdk_loc}/build-tools
+    mv tools #{sdk_loc}/
   "
   not_if "test -d #{sdk_loc}"
 end
@@ -30,7 +33,6 @@ execute "add-android-sdk-path" do
 end
 
 %w{
-    tools
     platform-tools
     extra-android-support
     extra-android-m2repository

diff --git a/makebuildserver b/makebuildserver
index 0da0c3c8f5e529103fe7ee501c2b9731ea47ffdb..5ae656f1f95a50e57a87ffda53ac7d0b8790fcdc 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -85,9 +85,9 @@ if not os.path.exists(cachedir):
     os.makedirs(cachedir, 0o755)
 
 cachefiles = [
-    ('android-sdk_r24.4.1-linux.tgz',
-     'https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz',
-     'e16917ad685c1563ccbc5dd782930ee1a700a1b6a6fd3e44b83ac694650435e9'),
+    ('android-sdk-tools.zip',
+     'https://dl.google.com/android/repository/tools_r25.1.7-linux.zip',
+     '3ca053600a86a5a64d5571edfbb1dad27f2bda3bfd2d38e2fe54322610b1ef0b'),
     ('android-platform-3.zip',
      'https://dl.google.com/android/repository/android-1.5_r04-linux.zip',
      '85b6c8f9797e56aa415d3a282428bb640c96b0acb17c11d41621bb2a5302fe64'),