Set up SDK and NDK env vars from python

[fdroidserver.git] / buildserver / cookbooks / android-sdk / recipes / default.rb

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 9cfa3cd71b26f75c690d500ebc3b48d0ef984d68..3d6ff562d8ffa8882b5cd47e93b0603e101763ef 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_r23-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
@@ -23,16 +23,10 @@ execute "add-android-sdk-path" do
   not_if "grep PATH-SDK /home/#{user}/.bsenv"
 end
 
-execute "add-android-home" do
-  user user
-  command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bsenv"
-  not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
-end
-
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "19.0.3"
+  ver = "20.0.0"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
@@ -51,7 +45,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
@@ -71,9 +64,9 @@ X
   not_if "test -d #{sdk_loc}/platform-tools"
 end
 
-%w{android-3 android-4 android-7 android-8 android-10 android-11
-   android-12 android-13 android-14 android-15 android-16 android-17
-   android-18 android-19
+%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
    extra-android-support extra-android-m2repository}.each do |sdk|
 
   script "add_sdk_#{sdk}" do