1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-02 09:10:11 +02:00

metadata.Build.ndk_path(): find long form ndk too

This commit is contained in:
FC Stegerman 2023-02-21 15:28:45 +01:00 committed by Hans-Christoph Steiner
parent 668a83a9af
commit a5978ad8b2

View File

@ -21,6 +21,7 @@
import git
from pathlib import Path
import platform
import os
import re
import logging
import importlib
@ -329,7 +330,13 @@ class Build(dict):
ndk = self.ndk
if isinstance(ndk, list):
ndk = self.ndk[0]
return common.config['ndk_paths'].get(ndk, '')
path = common.config['ndk_paths'].get(ndk)
if path:
return path
for vsn, path in common.config['ndk_paths'].items():
if not vsn.endswith("_orig") and path and os.path.basename(path) == ndk:
return path
return ''
flagtypes = {