Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updating the minimum Android target api for proper Vulkan support

Browse source
This commit is contained in:
Fredia Huya-Kouadio 2022-10-18 21:39:43 -07:00
parent 0bb1e89fb7
commit 2aba13e8fb
4 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
platform/android/detect.py
View file

@ -24,7 +24,11 @@ def can_build():
def get_opts():
return [
("ANDROID_SDK_ROOT", "Path to the Android SDK", get_env_android_sdk_root()),
("ndk_platform", 'Target platform (android-<api>, e.g. "android-24")', "android-24"),
(
"ndk_platform",
'Target platform (android-<api>, e.g. "android-' + str(get_min_target_api()) + '")',
"android-" + str(get_min_target_api()),
),
]
@ -46,6 +50,11 @@ def get_ndk_version():
return "23.2.8568313"
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
def get_min_target_api():
return 21
def get_flags():
return [
("arch", "arm64"), # Default for convenience.
@ -87,18 +96,18 @@ def configure(env: "Environment"):
)
sys.exit()
if get_min_sdk_version(env["ndk_platform"]) < get_min_target_api():
print(
"WARNING: minimum supported Android target api is %d. Forcing target api %d."
% (get_min_target_api(), get_min_target_api())
)
env["ndk_platform"] = "android-" + str(get_min_target_api())
install_ndk_if_needed(env)
ndk_root = env["ANDROID_NDK_ROOT"]
# Architecture
if get_min_sdk_version(env["ndk_platform"]) < 21 and env["arch"] in ["x86_64", "arm64"]:
print(
'WARNING: arch="%s" is not supported with "ndk_platform" lower than "android-21". Forcing platform 21.'
% env["arch"]
)
env["ndk_platform"] = "android-21"
if env["arch"] == "arm32":
target_triple = "armv7a-linux-androideabi"
elif env["arch"] == "arm64":