mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

provision-android-ndk: do all configuration via args

Browse source 
This makes it so it is easy to reuse this script in other contexts, like
in Docker, GitLab CI, etc.
This commit is contained in:
Hans-Christoph Steiner 2021-06-01 13:53:29 +02:00
parent d6c8ecc3bc
commit 28a4f9481a
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
2 changed files with 5 additions and 2 deletions
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", path: "provision-android-sdk" config.vm.provision "shell", path: "provision-android-sdk"
config.vm.provision "shell", path: "provision-android-ndk", config.vm.provision "shell", path: "provision-android-ndk",
args: ["/opt/android-sdk/ndk"] args: ["/opt/android-sdk/ndk", "r21e", "r22b"]
config.vm.provision "shell", path: "provision-gradle" config.vm.provision "shell", path: "provision-gradle"
end end

5
buildserver/provision-android-ndk
View file

@ -1,16 +1,19 @@
#!/bin/bash #!/bin/bash
# #
# $1 is the root dir to install the NDKs into
# $2 and after are the NDK releases to install
echo $0 echo $0
set -e set -e
set -x set -x
NDK_BASE=$1 NDK_BASE=$1
shift
test -e $NDK_BASE || mkdir -p $NDK_BASE test -e $NDK_BASE || mkdir -p $NDK_BASE
cd $NDK_BASE cd $NDK_BASE
for version in r21e r22b; 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-x86_64.zip > /dev/null
mv android-ndk-${version} \ mv android-ndk-${version} \