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

Override ANDROID_NDK_ROOT based on the project ndk version.

Browse source 
This helps resolve issues where the project ndk version differs from the one pointed by the `ANDROID_NDK_ROOT` environment variable (if it exists).
This commit is contained in:
Fredia Huya-Kouadio 2021-02-17 19:11:05 -08:00
parent 81fc37b1ff
commit edeca16fb6
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/android/detect.py
View file

@ -13,7 +13,7 @@ def get_name():
def can_build(): def can_build():
return ("ANDROID_NDK_ROOT" in os.environ) or ("ANDROID_SDK_ROOT" in os.environ) or ("ANDROID_HOME" in os.environ) return ("ANDROID_SDK_ROOT" in os.environ) or ("ANDROID_HOME" in os.environ)
def get_platform(platform): def get_platform(platform):
@ -43,14 +43,11 @@ def get_android_sdk_root():
# Return the ANDROID_NDK_ROOT environment variable. # Return the ANDROID_NDK_ROOT environment variable.
# If the env variable is already defined, we use it with the expectation that # We generate one for this build using the ANDROID_SDK_ROOT env
# the user knows what they're doing (e.g: testing a new NDK version).
# Otherwise, we generate one for this build using the ANDROID_SDK_ROOT env
# variable and the project ndk version. # variable and the project ndk version.
# If the env variable is already defined, we override it with
# our own to match what the project expects.
def get_android_ndk_root(): def get_android_ndk_root():
if "ANDROID_NDK_ROOT" in os.environ:
return os.environ.get("ANDROID_NDK_ROOT", 0)
else:
return get_android_sdk_root() + "/ndk/" + get_project_ndk_version() return get_android_sdk_root() + "/ndk/" + get_project_ndk_version()