Bump sdk to 24.4.1

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df6e202968edf99fa02966c20dedd9b020b96b21..74ae03930d7cf459ed3fe7c9918165235f8bca27 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ before_script:
   - echo " == Installing packages required by the 32-bit SDK"
   - apt-get -q install -y lib32stdc++6 lib32z1
   - echo " == Installing the Android SDK"
-  - wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.3.4-linux.tgz
+  - wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
   - tar -x -z -f android-sdk.tgz
   - mv android-sdk-linux android-sdk
   - export ANDROID_HOME=$PWD/android-sdk

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 8a8c77b295af16a1b74fd0e46bb95df6acb88228..ce187ea25b51a05ddfa38cb6674f13562360cdd7 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.4-linux.tgz
+    tar zxvf /vagrant/cache/android-sdk_r24.4.1-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

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