Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1318 from DmitriySalnikov/android_api_version 

[Scons] Set the minimum Android API level to 21
pull/866/merge
Rémi Verschelde 2023-11-22 22:56:44 +01:00 committed by GitHub
parent d0fdc3adf3 79d2a9c456
commit 32409472b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/android.py
View File

@ -8,7 +8,7 @@ def options(opts):
opts.Add( opts.Add(
"android_api_level", "android_api_level",
"Target Android API level", "Target Android API level",
"18" if "32" in ARGUMENTS.get("arch", "arm64") else "21", "21",
) )
opts.Add( opts.Add(
"ANDROID_HOME", "ANDROID_HOME",
@ -47,11 +47,9 @@ def generate(env):
my_spawn.configure(env) my_spawn.configure(env)
# Validate API level # Validate API level
api_level = int(env["android_api_level"]) if int(env["android_api_level"]) < 21:
if "64" in env["arch"] and api_level < 21: print("WARNING: minimum supported Android target api is 21. Forcing target api 21.")
print("WARN: 64-bit Android architectures require an API level of at least 21; setting android_api_level=21")
env["android_api_level"] = "21" env["android_api_level"] = "21"
api_level = 21
# Setup toolchain # Setup toolchain
toolchain = get_android_ndk_root(env) + "/toolchains/llvm/prebuilt/" toolchain = get_android_ndk_root(env) + "/toolchains/llvm/prebuilt/"