godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Remove extra arch suffix now redundant with the default one

Browse Source 
We would needlessly get file names like `*.arm64.armv8.o`.
This commit is contained in:
Rémi Verschelde 2022-11-25 16:25:11 +01:00
parent a9fbf3718d
commit 2a36127e34
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/detect.py
View File

@ -101,16 +101,12 @@ def configure(env: "Environment"):
if env["arch"] == "arm32": if env["arch"] == "arm32":
target_triple = "armv7a-linux-androideabi" target_triple = "armv7a-linux-androideabi"
env.extra_suffix = ".armv7" + env.extra_suffix
elif env["arch"] == "arm64": elif env["arch"] == "arm64":
target_triple = "aarch64-linux-android" target_triple = "aarch64-linux-android"
env.extra_suffix = ".armv8" + env.extra_suffix
elif env["arch"] == "x86_32": elif env["arch"] == "x86_32":
target_triple = "i686-linux-android" target_triple = "i686-linux-android"
env.extra_suffix = ".x86" + env.extra_suffix
elif env["arch"] == "x86_64": elif env["arch"] == "x86_64":
target_triple = "x86_64-linux-android" target_triple = "x86_64-linux-android"
env.extra_suffix = ".x86_64" + env.extra_suffix
target_option = ["-target", target_triple + str(get_min_sdk_version(env["ndk_platform"]))] target_option = ["-target", target_triple + str(get_min_sdk_version(env["ndk_platform"]))]
env.Append(ASFLAGS=[target_option, "-c"]) env.Append(ASFLAGS=[target_option, "-c"])