From edeca16fb66e4e8521a255c824a4247eb982592c Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Wed, 17 Feb 2021 19:11:05 -0800
Subject: Override `ANDROID_NDK_ROOT` based on the project ndk version.
This helps resolve issues where the project ndk version differs from the one pointed by the `ANDROID_NDK_ROOT` environment variable (if it exists).
---
platform/android/detect.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 98d4a21e26..5f0fcc9b77 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -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():
--
cgit v1.2.3