asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #46150 from m4gr3d/update_ndk_fetcher_logic

Browse source 
Override `ANDROID_NDK_ROOT` based on the project ndk version.
This commit is contained in:
Rémi Verschelde 2021-02-18 11:03:16 +01:00 committed by GitHub
commit 65a75dc5f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/android/detect.py
View file

@ -13,7 +13,7 @@ def get_name():
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):
@ -43,15 +43,12 @@ def get_android_sdk_root():
# Return the ANDROID_NDK_ROOT environment variable.
# If the env variable is already defined, we use it with the expectation that
# 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
# We generate one for this build using the ANDROID_SDK_ROOT env
# 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():
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()
def get_flags():