Update sdk and build-tools

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 0101c3c2e7829d9252c07336e695d54c53f0589e..a09a40658d06d0e3340c9a528fe69e982efe2a93 100644 (file)
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -1,6 +1,6 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_path = "/home/vagrant/android-ndk"
-build_tools = "19.0.3"
+build_tools = "19.1.0"
 ant = "ant"
 mvn3 = "mvn"
 gradle = "gradle"

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 17b3bbaba066a18a7989c6de11f4a9db31466822..741288338bfafc0d7c02ec52fb090b15c7ce0ac8 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_r22.3-linux.tgz
+    tar zxvf /vagrant/cache/android-sdk_r22.6.2-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
@@ -32,7 +32,7 @@ end
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "19.0.3"
+  ver = "19.1.0"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
@@ -51,7 +51,6 @@ X
   not_if "test -d #{sdk_loc}/build-tools/#{ver}"
 end
 
-# This is currently 19.0.1
 script "add_platform_tools" do
   interpreter "bash"
   user user

diff --git a/makebuildserver b/makebuildserver
index 38cbc0137ebe54e90d8ae5c41548fe2555617c6d..40040439053b0e02e71f2423865a2cf61278876a 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -62,9 +62,9 @@ if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 
 cachefiles = [
-    ('android-sdk_r22.6-linux.tgz',
-     'https://dl.google.com/android/android-sdk_r22.6-linux.tgz',
-     'da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f'),
+    ('android-sdk_r22.6.2-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r22.6.2-linux.tgz',
+     ''),
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),