chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e10b2dd
)
Update build-tools to 21.1.1
author
Daniel Martí
<mvdan@mvdan.cc>
Fri, 12 Dec 2014 11:39:12 +0000
(12:39 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Fri, 12 Dec 2014 11:40:09 +0000
(12:40 +0100)
buildserver/config.buildserver.py
patch
|
blob
|
history
buildserver/cookbooks/android-sdk/recipes/default.rb
patch
|
blob
|
history
examples/config.py
patch
|
blob
|
history
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/buildserver/config.buildserver.py
b/buildserver/config.buildserver.py
index 29fbe07d699fe1c912c9d03ce63ae65df9ac6436..eb715c3d3d37986a87a259376ee8e5a7ed52b073 100644
(file)
--- 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"
sdk_path = "/home/vagrant/android-sdk"
ndk_path = "/home/vagrant/android-ndk"
-build_tools = "21.
0.2
"
+build_tools = "21.
1.1
"
ant = "ant"
mvn3 = "mvn"
gradle = "gradle"
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 1f0f6b5fde51e34edae10e208f1921eea0933fc3..1a42a61aaac9dbac42e4eef457e9f454ac18a781 100644
(file)
--- 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
script "add_build_tools" do
interpreter "bash"
user user
- ver = "21.
0.2
"
+ ver = "21.
1.1
"
cwd "/tmp"
code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
cwd "/tmp"
code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
diff --git
a/examples/config.py
b/examples/config.py
index 974a4d5bc04ba43a574c0aa399061e02118019a8..616aa0b06c9e3e1ad38c256e337e63e66dbae62c 100644
(file)
--- 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
# 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.
0.2
"
+build_tools = "21.
1.1
"
# Command for running Ant
# ant = "/path/to/ant"
# Command for running Ant
# ant = "/path/to/ant"
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index f6e9538f9530ad0996a32045f1ca838752eb2f0d..fd04a4db0ff9f9ceaf5521e19e5b894df94d5340 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-42,7
+42,7
@@
env = None
default_config = {
'sdk_path': "$ANDROID_HOME",
'ndk_path': "$ANDROID_NDK",
default_config = {
'sdk_path': "$ANDROID_HOME",
'ndk_path': "$ANDROID_NDK",
- 'build_tools': "21.
0.2
",
+ 'build_tools': "21.
1.1
",
'ant': "ant",
'mvn3': "mvn",
'gradle': 'gradle',
'ant': "ant",
'mvn3': "mvn",
'gradle': 'gradle',