From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 13 Nov 2013 14:54:38 +0000 (+0000)
Subject: Revert "Switch to build-tools 19.0.0" - buggy build tools
X-Git-Tag: 0.1~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0876c52e55456622f57d98032e1738df55d8a46b;p=fdroidserver.git

Revert "Switch to build-tools 19.0.0" - buggy build tools

This reverts commit a81aebb2369cf0ac1b5552969f8e9a9a9c609658.
---

diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index c295fd30..a50848e0 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -29,7 +29,7 @@ execute "add-android-home" do
   not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
 end
 
-%w{19.0.0}.each do |ver|
+%w{18.1.1}.each do |ver|
 
   script "add_build_tools_#{ver}" do
     interpreter "bash"
diff --git a/config.buildserver.py b/config.buildserver.py
index c8d6b567..4e8af01a 100644
--- a/config.buildserver.py
+++ b/config.buildserver.py
@@ -1,6 +1,6 @@
 sdk_path = "/home/vagrant/android-sdk"
 ndk_path = "/home/vagrant/android-ndk"
-build_tools = "19.0.0"
+build_tools = "18.1.1"
 javacc_path = "/usr/share/java"
 mvn3 = "mvn"
 gradle = "gradle"
diff --git a/config.sample.py b/config.sample.py
index 5e77d0fe..6de1fcca 100644
--- a/config.sample.py
+++ b/config.sample.py
@@ -10,7 +10,7 @@ sdk_path = "/path/to/android-sdk-linux_86"
 ndk_path = "/path/to/android-ndk-r9"
 
 # Build tools version to be used
-build_tools = "19.0.0"
+build_tools = "18.1.1"
 
 # Path to Android Java SWT ($ANDROID_SWT)
 javacc_path = "/usr/share/java"