mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-13 18:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install build-tools from the cache too

Browse source
This commit is contained in:
Daniel Martí 2015-11-20 12:14:08 -08:00
parent 7842b08f40
commit 882cfe3912
2 changed files with 86 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

45
buildserver/cookbooks/android-sdk/recipes/default.rb
View file

@ -14,6 +14,14 @@ script "setup-android-sdk" do
not_if "test -d #{sdk_loc}"
end
script "setup-sdk-dirs" do
interpreter "bash"
user user
code "
mkdir -p #{sdk_loc}/build-tools
"
end
execute "add-android-sdk-path" do
user user
path = "#{sdk_loc}/tools:#{sdk_loc}/platform-tools"
@ -24,27 +32,6 @@ end
%w{
tools
platform-tools
build-tools-17.0.0
build-tools-18.0.1
build-tools-18.1.0
build-tools-18.1.1
build-tools-19.0.0
build-tools-19.0.1
build-tools-19.0.2
build-tools-19.0.3
build-tools-19.1.0
build-tools-20.0.0
build-tools-21.0.0
build-tools-21.0.1
build-tools-21.0.2
build-tools-21.1.0
build-tools-21.1.1
build-tools-21.1.2
build-tools-22.0.0
build-tools-22.0.1
build-tools-23.0.0
build-tools-23.0.1
build-tools-23.0.2
extra-android-support
extra-android-m2repository
}.each do |pkg|
@ -58,7 +45,6 @@ y
X
"
end
end
%w{3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23}.each do |api|
@ -74,3 +60,18 @@ end
end
end
%w{17.0.0 18.0.1 18.1.0 18.1.1 19.0.0 19.0.1 19.0.2 19.0.3 19.1.0
20.0.0 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1 21.1.2 22.0.0 22.0.1
23.0.0 23.0.1 23.0.2
}.each do |ver|
script "add_btools_#{ver}" do
interpreter "bash"
user user
cwd "/tmp"
code "
unzip /vagrant/cache/build-tools-#{ver}.zip
mv android-*/ #{sdk_loc}/build-tools/#{ver}
"
not_if "test -d #{sdk_loc}/build-tools/#{ver}"
end
end