kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00
Code Activity

update preinstalled ndk to r23b

Browse Source
This commit is contained in:
linsui 2022-02-10 16:47:03 +08:00
parent 39a25fc191
commit 3f62e0ebde
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildserver/Vagrantfile vendored
View File

@ -84,7 +84,7 @@ Vagrant.configure("2") do |config|
args: [configfile['debian_mirror']] args: [configfile['debian_mirror']]
config.vm.provision "shell", name: "android-sdk", path: "provision-android-sdk" config.vm.provision "shell", name: "android-sdk", path: "provision-android-sdk"
config.vm.provision "shell", name: "android-ndk", path: "provision-android-ndk", config.vm.provision "shell", name: "android-ndk", path: "provision-android-ndk",
args: ["/opt/android-sdk/ndk", "r21e", "r22b"] args: ["/opt/android-sdk/ndk", "r21e", "r23b"]
config.vm.provision "shell", name: "gradle", path: "provision-gradle" config.vm.provision "shell", name: "gradle", path: "provision-gradle"
config.vm.provision "shell", name: "buildserverid", path: "provision-buildserverid", config.vm.provision "shell", name: "buildserverid", path: "provision-buildserverid",
args: [`git rev-parse HEAD`] args: [`git rev-parse HEAD`]

2
buildserver/provision-android-ndk
View File

@ -15,7 +15,7 @@ cd $NDK_BASE
for version in $@; do for version in $@; do
if [ ! -e ${NDK_BASE}/${version} ]; then if [ ! -e ${NDK_BASE}/${version} ]; then
unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null unzip /vagrant/cache/android-ndk-${version}-linux*.zip > /dev/null
mv android-ndk-${version} \ mv android-ndk-${version} \
`sed -En 's,^Pkg.Revision *= *(.+),\1,p' android-ndk-${version}/source.properties` `sed -En 's,^Pkg.Revision *= *(.+),\1,p' android-ndk-${version}/source.properties`
fi fi

4
makebuildserver
View File

@ -304,8 +304,8 @@ CACHE_FILES = [
'0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'), '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c'),
('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip', ('https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip',
'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e'), 'ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e'),
('https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip', ('https://dl.google.com/android/repository/android-ndk-r23b-linux.zip',
'ac3a0421e76f71dd330d0cd55f9d99b9ac864c4c034fc67e0d671d022d4e806b'), 'c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382'),
] ]