mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Update build-tools to 20.0.0
This commit is contained in:
parent
fdb53b75f4
commit
cbdcdd1e78
@ -1,6 +1,6 @@
|
|||||||
sdk_path = "/home/vagrant/android-sdk"
|
sdk_path = "/home/vagrant/android-sdk"
|
||||||
ndk_path = "/home/vagrant/android-ndk"
|
ndk_path = "/home/vagrant/android-ndk"
|
||||||
build_tools = "19.1.0"
|
build_tools = "20.0.0"
|
||||||
ant = "ant"
|
ant = "ant"
|
||||||
mvn3 = "mvn"
|
mvn3 = "mvn"
|
||||||
gradle = "gradle"
|
gradle = "gradle"
|
||||||
|
@ -32,7 +32,7 @@ end
|
|||||||
script "add_build_tools" do
|
script "add_build_tools" do
|
||||||
interpreter "bash"
|
interpreter "bash"
|
||||||
user user
|
user user
|
||||||
ver = "19.1.0"
|
ver = "20.0.0"
|
||||||
cwd "/tmp"
|
cwd "/tmp"
|
||||||
code "
|
code "
|
||||||
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
|
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
# Override the path to the Android NDK, $ANDROID_NDK by default
|
# Override the path to the Android NDK, $ANDROID_NDK by default
|
||||||
# ndk_path = "/path/to/android-ndk"
|
# ndk_path = "/path/to/android-ndk"
|
||||||
# Build tools version to be used
|
# Build tools version to be used
|
||||||
build_tools = "19.0.2"
|
build_tools = "20.0.0"
|
||||||
|
|
||||||
# Command for running Ant
|
# Command for running Ant
|
||||||
# ant = "/path/to/ant"
|
# ant = "/path/to/ant"
|
||||||
|
@ -42,7 +42,7 @@ def get_default_config():
|
|||||||
return {
|
return {
|
||||||
'sdk_path': os.getenv("ANDROID_HOME"),
|
'sdk_path': os.getenv("ANDROID_HOME"),
|
||||||
'ndk_path': os.getenv("ANDROID_NDK"),
|
'ndk_path': os.getenv("ANDROID_NDK"),
|
||||||
'build_tools': "19.1.0",
|
'build_tools': "20.0.0",
|
||||||
'ant': "ant",
|
'ant': "ant",
|
||||||
'mvn3': "mvn",
|
'mvn3': "mvn",
|
||||||
'gradle': 'gradle',
|
'gradle': 'gradle',
|
||||||
|
@ -25,8 +25,8 @@ copy_apks_into_repo() {
|
|||||||
|
|
||||||
create_fake_android_home() {
|
create_fake_android_home() {
|
||||||
mkdir $1/build-tools
|
mkdir $1/build-tools
|
||||||
mkdir $1/build-tools/19.1.0
|
mkdir $1/build-tools/20.0.0
|
||||||
touch $1/build-tools/19.1.0/aapt
|
touch $1/build-tools/20.0.0/aapt
|
||||||
}
|
}
|
||||||
|
|
||||||
create_test_dir() {
|
create_test_dir() {
|
||||||
|
Loading…
Reference in New Issue
Block a user