From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 12 Dec 2014 11:57:12 +0000 (+0100)
Subject: Bump build-tools again to 21.1.2
X-Git-Tag: 0.3.0~14
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=16601a0be3108523404ed6ef2726d99ef0d23b41;p=fdroidserver.git

Bump build-tools again to 21.1.2
---

diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index eb715c3d..3982c2ee 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -1,6 +1,6 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_path = "/home/vagrant/android-ndk"
-build_tools = "21.1.1"
+build_tools = "21.1.2"
 ant = "ant"
 mvn3 = "mvn"
 gradle = "gradle"
diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 1a42a61a..4626ec73 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -26,7 +26,7 @@ end
 script "add_build_tools" do
   interpreter "bash"
   user user
-  ver = "21.1.1"
+  ver = "21.1.2"
   cwd "/tmp"
   code "
     if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
diff --git a/examples/config.py b/examples/config.py
index 616aa0b0..44d73e01 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -9,7 +9,7 @@
 # Override the path to the Android NDK, $ANDROID_NDK by default
 # ndk_path = "/path/to/android-ndk"
 # Build tools version to be used
-build_tools = "21.1.1"
+build_tools = "21.1.2"
 
 # Command for running Ant
 # ant = "/path/to/ant"
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index fd04a4db..3a42ec58 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -42,7 +42,7 @@ env = None
 default_config = {
     'sdk_path': "$ANDROID_HOME",
     'ndk_path': "$ANDROID_NDK",
-    'build_tools': "21.1.1",
+    'build_tools': "21.1.2",
     'ant': "ant",
     'mvn3': "mvn",
     'gradle': 'gradle',