godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Android: Replace deprecated distutils LooseVersion usage

Browse Source 
(cherry picked from commit 9e9ea714ad)
This commit is contained in:
Rémi Verschelde
2024-11-05 21:22:22 +01:00
parent 2fd2b8a4e1
commit dbbcfe3b87
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/detect.py
View File

@@ -1,7 +1,6 @@
import os import os
import sys import sys
import platform import platform
from distutils.version import LooseVersion
def is_active(): def is_active():
@@ -308,8 +307,14 @@ def configure(env):
# Link flags # Link flags
# HACK: Replaced use of now obsoleted distutils.version.LooseVersion with this simple method,
# which isn't bullet proof but should be sufficient here with "x.y.z" parameters.
# Alternatives imply adding more dependencies.
def version_tuple(v):
return tuple(map(int, (v.split("."))))
ndk_version = get_env_ndk_version(env["ANDROID_NDK_ROOT"]) ndk_version = get_env_ndk_version(env["ANDROID_NDK_ROOT"])
if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("17.1.4828580"): if ndk_version != None and version_tuple(ndk_version) >= version_tuple("17.1.4828580"):
env.Append(LINKFLAGS=["-Wl,--exclude-libs,libgcc.a", "-Wl,--exclude-libs,libatomic.a", "-nostdlib++"]) env.Append(LINKFLAGS=["-Wl,--exclude-libs,libgcc.a", "-Wl,--exclude-libs,libatomic.a", "-nostdlib++"])
else: else:
env.Append( env.Append(