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

Merge branch 'master' into 'master'

Browse source 
fix broken NDK extraction routine to correctly name resulting dir

See merge request fdroid/fdroidserver!934
This commit is contained in:
Hans-Christoph Steiner 2021-06-01 12:46:45 +00:00
commit 2a259552d3
3 changed files with 15 additions and 11 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} \

3
fdroidserver/common.py
View file

@ -4117,8 +4117,9 @@ def _install_ndk(ndk):
zipfp.extract(info.filename, path=ndk_base) zipfp.extract(info.filename, path=ndk_base)
os.chmod(os.path.join(ndk_base, info.filename), 0o644) # nosec bandit B103 os.chmod(os.path.join(ndk_base, info.filename), 0o644) # nosec bandit B103
os.remove(zipball) os.remove(zipball)
extracted = glob.glob(os.path.join(ndk_base, '*'))[0] for extracted in glob.glob(os.path.join(ndk_base, '*')):
version = get_ndk_version(extracted) version = get_ndk_version(extracted)
if os.path.basename(extracted) != version:
ndk_dir = os.path.join(ndk_base, version) ndk_dir = os.path.join(ndk_base, version)
os.rename(extracted, ndk_dir) os.rename(extracted, ndk_dir)
if 'ndk_paths' not in config: if 'ndk_paths' not in config: