From: Ciaran Gultnieks Date: Wed, 16 Oct 2013 18:32:38 +0000 (+0100) Subject: Revert "Fix b315968b (at least to the extent that it's now possible to make a buildse... X-Git-Tag: 0.1~346 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=01ab262a9ad7a22571404609d20b5f5d3a96b730;p=fdroidserver.git Revert "Fix b315968b (at least to the extent that it's now possible to make a buildserver again)" This reverts commit c74bbdf5dca70447823b404f9876d6c0f8d5f25c. --- diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb index 4fd7bf0b..222c14ea 100644 --- a/buildserver/cookbooks/android-sdk/recipes/default.rb +++ b/buildserver/cookbooks/android-sdk/recipes/default.rb @@ -29,17 +29,6 @@ execute "add-android-home" do not_if "grep ANDROID_HOME /home/#{user}/.bsenv" end -execute "add-maven-support-repo" do - user user - command "mkdir /home/#{user}/.m2 && echo \" -android -androidandroid-support-repository -file:///opt/android/sdk/extras/android/m2repository/ - -\" > /home/#{user}/.m2/settings.xml" - not_if "grep m2repository /home/#{user}/.m2/settings.xml" -end - %w{17.0.0 18.0.1}.each do |ver| script "add_build_tools_#{ver}" do