Update many android tools

* Gradle from 1.7 to 1.8
* Android SDK from 21.0.1 to 22.2.1
* SDK Build Tools from 18.0.1 to 18.1.1
* Added legacy toolchains to NDK r9
This commit is contained in:
Daniel Martí 2013-10-17 15:29:52 +02:00
parent 8d1db23eee
commit efcf850247
6 changed files with 26 additions and 16 deletions

View file

@ -26,6 +26,7 @@ script "setup-android-ndk" do
SUFFIX=''
fi
tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX.tar.bz2
tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX-legacy-toolchains.tar.bz2
mv android-ndk-r9 #{ndk_loc}
"
not_if do

View file

@ -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_r22.2.1-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
@ -29,7 +29,7 @@ execute "add-android-home" do
not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
end
%w{17.0.0 18.0.1}.each do |ver|
%w{18.1.1}.each do |ver|
script "add_build_tools_#{ver}" do
interpreter "bash"

View file

@ -19,8 +19,8 @@ script "install-gradle" do
cwd "/tmp"
interpreter "bash"
code "
unzip /vagrant/cache/gradle-1.7-bin.zip
mv gradle-1.7 /opt/gradle
unzip /vagrant/cache/gradle-1.8-bin.zip
mv gradle-1.8 /opt/gradle
"
not_if "test -d /opt/gradle"
end