From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 12 Jan 2014 10:57:47 +0000 (+0100)
Subject: Remove google apis, they are deprecated and broken
X-Git-Tag: 0.1~14
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=607736f85d777adcbb237af70e5ce58af0d5e8e3;p=fdroidserver.git

Remove google apis, they are deprecated and broken
---

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 19002064..6e91b341 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -97,29 +97,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
-
-