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 222c14eaa544fa7de017d375fa212098cae19836..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_r21.0.1-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,36 +23,50 @@ execute "add-android-sdk-path" do
   not_if "grep PATH-SDK /home/#{user}/.bsenv"
 end
 
-execute "add-android-home" do
+script "add_build_tools" do
+  interpreter "bash"
   user user
-  command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bsenv"
-  not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
-end
+  ver = "20.0.0"
+  cwd "/tmp"
+  code "
+    if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
+      echo Installing from cache
+      mkdir #{sdk_loc}/build-tools
+      tar -C #{sdk_loc}/build-tools -z -x -f /vagrant/cache/build-tools/#{ver}.tar.gz
+    else
+      #{sdk_loc}/tools/android update sdk --no-ui -a -t build-tools-#{ver} <<X
+y
 
-%w{17.0.0 18.0.1}.each do |ver|
+X
+    fi
+       sed -i '/BTPATH/d' /home/#{user}/.bsenv
+       echo \"export PATH=\\$PATH:#{sdk_loc}/build-tools/#{ver} #BTPATH\" >> /home/#{user}/.bsenv
+  "
+  not_if "test -d #{sdk_loc}/build-tools/#{ver}"
+end
 
-  script "add_build_tools_#{ver}" do
-    interpreter "bash"
-    user user
-    cwd "/tmp"
-    code "
-      if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
-        echo Installing from cache
-        mkdir #{sdk_loc}/build-tools
-        tar -C #{sdk_loc}/build-tools -z -x -f /vagrant/cache/build-tools/#{ver}.tar.gz
-      else
-        #{sdk_loc}/tools/android update sdk --no-ui -a -t build-tools-#{ver} <<X
+script "add_platform_tools" do
+  interpreter "bash"
+  user user
+  cwd "/tmp"
+  code "
+    if [ -f /vagrant/cache/platform-tools.tar.gz ] ; then
+      echo Installing from cache
+      mkdir #{sdk_loc}/platform-tools
+      tar -C #{sdk_loc}/platform-tools -z -x -f /vagrant/cache/platform-tools.tar.gz
+    else
+      #{sdk_loc}/tools/android update sdk --no-ui -a -t platform-tools <<X
 y
 
 X
-      fi
-    "
-    not_if "test -d #{sdk_loc}/build-tools/#{ver}"
-  end
+    fi
+  "
+  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
+%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
@@ -76,29 +90,3 @@ X
 
 end
 
-%w{addon-google_apis-google-7 addon-google_apis-google-10 addon-google_apis-google-15 addon-google_apis-google-16 addon-google_apis-google-17}.each do |sdk|
-
-  script "add_addon_#{sdk}" do
-    interpreter "bash"
-    user user
-    cwd "/tmp"
-    code "
-      if [ -f /vagrant/cache/add-ons/#{sdk}.tar.gz ] ; then
-        echo Installing from cache
-        tar -C #{sdk_loc}/add-ons -z -x -f /vagrant/cache/add-ons/#{sdk}.tar.gz
-      else
-        echo Installing via 'android'
-        #{sdk_loc}/tools/android update sdk --no-ui -a -t #{sdk} <<X
-y
-
-X
-      fi
-    "
-
-    not_if "test -d #{sdk_loc}/add-ons/#{sdk}"
-
-  end
-
-end
-
-