Install build-tools from the cache too

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 929268dc5a6c710cd545f86cabdc8d955a26ea0e..98aa4dc39282eb7aad0b1a492f9901aac73d9c96 100644 (file)
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -14,6 +14,14 @@ script "setup-android-sdk" do
   not_if "test -d #{sdk_loc}"
 end
 
+script "setup-sdk-dirs" do
+  interpreter "bash"
+  user user
+  code "
+    mkdir -p #{sdk_loc}/build-tools
+  "
+end
+
 execute "add-android-sdk-path" do
   user user
   path = "#{sdk_loc}/tools:#{sdk_loc}/platform-tools"
@@ -24,27 +32,6 @@ end
 %w{
     tools
     platform-tools
-    build-tools-17.0.0
-    build-tools-18.0.1
-    build-tools-18.1.0
-    build-tools-18.1.1
-    build-tools-19.0.0
-    build-tools-19.0.1
-    build-tools-19.0.2
-    build-tools-19.0.3
-    build-tools-19.1.0
-    build-tools-20.0.0
-    build-tools-21.0.0
-    build-tools-21.0.1
-    build-tools-21.0.2
-    build-tools-21.1.0
-    build-tools-21.1.1
-    build-tools-21.1.2
-    build-tools-22.0.0
-    build-tools-22.0.1
-    build-tools-23.0.0
-    build-tools-23.0.1
-    build-tools-23.0.2
     extra-android-support
     extra-android-m2repository
 }.each do |pkg|
@@ -58,7 +45,6 @@ y
 X
     "
   end
-
 end
 
 %w{3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23}.each do |api|
@@ -74,3 +60,18 @@ end
   end
 end
 
+%w{17.0.0 18.0.1 18.1.0 18.1.1 19.0.0 19.0.1 19.0.2 19.0.3 19.1.0
+    20.0.0 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1 21.1.2 22.0.0 22.0.1
+    23.0.0 23.0.1 23.0.2
+}.each do |ver|
+  script "add_btools_#{ver}" do
+    interpreter "bash"
+    user user
+    cwd "/tmp"
+    code "
+      unzip /vagrant/cache/build-tools-#{ver}.zip
+      mv android-*/ #{sdk_loc}/build-tools/#{ver}
+    "
+    not_if "test -d #{sdk_loc}/build-tools/#{ver}"
+  end
+end

diff --git a/makebuildserver b/makebuildserver
index 01bf50bdf6f277c8e4e3a69162578adf4d722f95..5a8aa6e4ab870cdcbd4060b5162ad5fad0a435ed 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -130,6 +130,69 @@ cachefiles = [
     ('android-platform-23.zip',
      'https://dl.google.com/android/repository/android-23_r01.zip',
      '16e828bec35521f5529c998a6d312aaa6155cd4aabb5507d9eb2d4b3c9a1aff0'),
+    ('build-tools-17.0.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r17-linux.zip',
+     '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
+    ('build-tools-18.0.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
+     'a9b7b1bdfd864780fdd03fa1683f3fe712a4276cf200646833808cb9159bafc0'),
+    ('build-tools-18.1.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r18.1-linux.zip',
+     '0753606738f31cc346426db1d46b7d021bc1bdaff63085f9ee9d278ee054d3c9'),
+    ('build-tools-18.1.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip',
+     '7e4ed326b53078f4f23276ddab52c400011f7593dfbb6508c0a6671954dba8b0'),
+    ('build-tools-19.0.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r19-linux.zip',
+     '9442e1c5212ed594e344a231fa93e7a017a5ef8cc661117011f1d3142eca7acc'),
+    ('build-tools-19.0.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip',
+     'b068edaff05c3253a63e9c8f0e1786429799b7e4b01514a847a8b291beb9232e'),
+    ('build-tools-19.0.2.zip',
+     'https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip',
+     '06124fad0d4bde21191240d61df2059a8546c085064a9a57d024c36fa2c9bebb'),
+    ('build-tools-19.0.3.zip',
+     'https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip',
+     'bc9b3db0de4a3e233a170274293359051a758f1e3f0d0d852ff4ad6d90d0a794'),
+    ('build-tools-19.1.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r19.1-linux.zip',
+     '3833b409f78c002a83244e220be380ea6fa44d604e0d47de4b7e5daefe7cd3f4'),
+    ('build-tools-20.0.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r20-linux.zip',
+     '296e09d62095d80e6eaa06a64cfa4c6f9f317c2d67ad8da6514523ec66f5c871'),
+    ('build-tools-21.0.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r21-linux.zip',
+     '12b818f38fe1b68091b94545988317438efbf41eb61fd36b72cd79f536044065'),
+    ('build-tools-21.0.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip',
+     'a8922e80d3dd0cf6df14b29a7862448fa111b48086c639168d4b18c92431f559'),
+    ('build-tools-21.0.2.zip',
+     'https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip',
+     '859b17a6b65d063dfd86c163489b736b12bdeecd9173fdddb3e9f32e0fe584b7'),
+    ('build-tools-21.1.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r21.1-linux.zip',
+     '022a85b92360272379b2f04b8a4d727e754dbe7eb8ab5a9568190e33e480d8f1'),
+    ('build-tools-21.1.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip',
+     '29b612484de6b5cde0df6de655e413f7611b0557b440538397afa69b557e2f08'),
+    ('build-tools-21.1.2.zip',
+     'https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip',
+     '3f88efc2d5316fb73f547f35b472610eed5e6f3f56762750ddad1c7d1d81660d'),
+    ('build-tools-22.0.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r22-linux.zip',
+     '061c021243f04c80c19568a6e3a027c00d8e269c9311d7bf07fced60fbde7bd5'),
+    ('build-tools-22.0.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip',
+     '91e5524bf227aad1135ddd10905518ac49f74797d33d48920dcf8364b9fde214'),
+    ('build-tools-23.0.0.zip',
+     'https://dl.google.com/android/repository/build-tools_r23-linux.zip',
+     '56bf4fc6c43638c55fef4a0937bad38281945725459841879b436c6922df786c'),
+    ('build-tools-23.0.1.zip',
+     'https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip',
+     'e56b3ef7b760ad06a7cee9b2d52ba7f43133dcecedfa5357f8845b3a80aeeecf'),
+    ('build-tools-23.0.2.zip',
+     'https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip',
+     '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),