mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Update many android tools
* Gradle from 1.7 to 1.8 * Android SDK from 21.0.1 to 22.2.1 * SDK Build Tools from 18.0.1 to 18.1.1 * Added legacy toolchains to NDK r9
This commit is contained in:
parent
8d1db23eee
commit
efcf850247
@ -26,6 +26,7 @@ script "setup-android-ndk" do
|
|||||||
SUFFIX=''
|
SUFFIX=''
|
||||||
fi
|
fi
|
||||||
tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX.tar.bz2
|
tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX.tar.bz2
|
||||||
|
tar jxvf /vagrant/cache/android-ndk-r9-linux-x86$SUFFIX-legacy-toolchains.tar.bz2
|
||||||
mv android-ndk-r9 #{ndk_loc}
|
mv android-ndk-r9 #{ndk_loc}
|
||||||
"
|
"
|
||||||
not_if do
|
not_if do
|
||||||
|
@ -8,7 +8,7 @@ script "setup-android-sdk" do
|
|||||||
user user
|
user user
|
||||||
cwd "/tmp"
|
cwd "/tmp"
|
||||||
code "
|
code "
|
||||||
tar zxvf /vagrant/cache/android-sdk_r21.0.1-linux.tgz
|
tar zxvf /vagrant/cache/android-sdk_r22.2.1-linux.tgz
|
||||||
mv android-sdk-linux #{sdk_loc}
|
mv android-sdk-linux #{sdk_loc}
|
||||||
#{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
|
#{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
|
||||||
#{sdk_loc}/tools/android update sdk --no-ui -t tool
|
#{sdk_loc}/tools/android update sdk --no-ui -t tool
|
||||||
@ -29,7 +29,7 @@ execute "add-android-home" do
|
|||||||
not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
|
not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
|
||||||
end
|
end
|
||||||
|
|
||||||
%w{17.0.0 18.0.1}.each do |ver|
|
%w{18.1.1}.each do |ver|
|
||||||
|
|
||||||
script "add_build_tools_#{ver}" do
|
script "add_build_tools_#{ver}" do
|
||||||
interpreter "bash"
|
interpreter "bash"
|
||||||
|
@ -19,8 +19,8 @@ script "install-gradle" do
|
|||||||
cwd "/tmp"
|
cwd "/tmp"
|
||||||
interpreter "bash"
|
interpreter "bash"
|
||||||
code "
|
code "
|
||||||
unzip /vagrant/cache/gradle-1.7-bin.zip
|
unzip /vagrant/cache/gradle-1.8-bin.zip
|
||||||
mv gradle-1.7 /opt/gradle
|
mv gradle-1.8 /opt/gradle
|
||||||
"
|
"
|
||||||
not_if "test -d /opt/gradle"
|
not_if "test -d /opt/gradle"
|
||||||
end
|
end
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
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 = "18.0.1"
|
build_tools = "18.1.1"
|
||||||
javacc_path = "/usr/share/java"
|
javacc_path = "/usr/share/java"
|
||||||
mvn3 = "mvn"
|
mvn3 = "mvn"
|
||||||
gradle = "gradle"
|
gradle = "gradle"
|
||||||
gradle_plugin = "0.5.+"
|
gradle_plugin = "0.6.+"
|
||||||
|
@ -6,10 +6,11 @@
|
|||||||
sdk_path = "/path/to/android-sdk-linux_86"
|
sdk_path = "/path/to/android-sdk-linux_86"
|
||||||
|
|
||||||
# Path to the Android NDK ($ANDROID_NDK)
|
# Path to the Android NDK ($ANDROID_NDK)
|
||||||
|
# Legacy toolchains are only needed by some apps
|
||||||
ndk_path = "/path/to/android-ndk-r9"
|
ndk_path = "/path/to/android-ndk-r9"
|
||||||
|
|
||||||
# Build tools version to be used
|
# Build tools version to be used
|
||||||
build_tools = "18.1"
|
build_tools = "18.1.1"
|
||||||
|
|
||||||
# Path to Android Java SWT ($ANDROID_SWT)
|
# Path to Android Java SWT ($ANDROID_SWT)
|
||||||
javacc_path = "/usr/share/java"
|
javacc_path = "/usr/share/java"
|
||||||
@ -21,7 +22,9 @@ mvn3 = "mvn3"
|
|||||||
gradle = "gradle"
|
gradle = "gradle"
|
||||||
|
|
||||||
# Android gradle plugin version
|
# Android gradle plugin version
|
||||||
gradle_plugin = "0.5.+"
|
# "0.5.+" -> gradle 1.7
|
||||||
|
# "0.6.+" -> gradle 1.8
|
||||||
|
gradle_plugin = "0.6.+"
|
||||||
|
|
||||||
# Max height and width (in pixels) for the icons in the repo
|
# Max height and width (in pixels) for the icons in the repo
|
||||||
# This corresponds to 72x72 pixels, i.e. mdpi
|
# This corresponds to 72x72 pixels, i.e. mdpi
|
||||||
|
@ -48,22 +48,28 @@ cachedir = os.path.join('buildserver', 'cache')
|
|||||||
if not os.path.exists(cachedir):
|
if not os.path.exists(cachedir):
|
||||||
os.mkdir(cachedir)
|
os.mkdir(cachedir)
|
||||||
cachefiles = [
|
cachefiles = [
|
||||||
('android-sdk_r21.0.1-linux.tgz',
|
('android-sdk_r22.2.1-linux.tgz',
|
||||||
'http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz',
|
'http://dl.google.com/android/android-sdk_r22.2.1-linux.tgz',
|
||||||
'e797ff3abbdc0fe2e7299e82e92ade830fa922ddd045d9a5a2d187c5c1a2661c'),
|
'17ea4610008985eb1454b3b25ad00c59300cee3141f7ea3deec98f45d862faa5'),
|
||||||
('gradle-1.7-bin.zip',
|
('gradle-1.8-bin.zip',
|
||||||
'http://services.gradle.org/distributions/gradle-1.7-bin.zip',
|
'http://services.gradle.org/distributions/gradle-1.8-bin.zip',
|
||||||
'360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30')]
|
'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703')]
|
||||||
if arch64:
|
if arch64:
|
||||||
cachefiles.extend([
|
cachefiles.extend([
|
||||||
('android-ndk-r9-linux-x64_64.tar.bz2',
|
('android-ndk-r9-linux-x64_64.tar.bz2',
|
||||||
'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2',
|
'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2',
|
||||||
'8a6013bfd8a8709592c53086c4f841933f5f2b175dd030326406d24ff4daa267')])
|
'8a6013bfd8a8709592c53086c4f841933f5f2b175dd030326406d24ff4daa267'),
|
||||||
|
('android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2',
|
||||||
|
'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2',
|
||||||
|
'087fbca38a1a2c1a309de272d22e84bbc1c3e2254211761180572fde75faab27')])
|
||||||
else:
|
else:
|
||||||
cachefiles.extend([
|
cachefiles.extend([
|
||||||
('android-ndk-r9-linux-x86.tar.bz2',
|
('android-ndk-r9-linux-x86.tar.bz2',
|
||||||
'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2',
|
'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86.tar.bz2',
|
||||||
'30f3da01e4d8d3415777b5d88a0b70fac5a4620807fd28110f9bc4c8093f6b6e')])
|
'30f3da01e4d8d3415777b5d88a0b70fac5a4620807fd28110f9bc4c8093f6b6e'),
|
||||||
|
('android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2',
|
||||||
|
'http://dl.google.com/android/ndk/android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2',
|
||||||
|
'26b94f0a5d686b4892cb22b06094751efded0958baed380b2ccce56517fd830b')])
|
||||||
wanted = []
|
wanted = []
|
||||||
for f, src, shasum in cachefiles:
|
for f, src, shasum in cachefiles:
|
||||||
if not os.path.exists(os.path.join(cachedir, f)):
|
if not os.path.exists(os.path.join(cachedir, f)):
|
||||||
|
Loading…
Reference in New Issue
Block a user