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 c295fd30b6711b56b74e83c69c8b1ed2dbe31df2..a50848e06139661b6dd7041aaaaf94133ec0c89d 100644 (file)
--- 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 c8d6b567490debe7894ae8c83e8671c7935aca5c..4e8af01a81b3743817e96dd8be846723e47e729c 100644 (file)
--- 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 5e77d0fe20191bf51aaf289df289ef48c2916850..6de1fcca8c23235cb2833b45607a9a346a907d68 100644 (file)
--- 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"