godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Replace the use of the ANDROID_SDK_ROOT env variable with ANDROID_HOME as the former is deprecated.

Browse Source 
See https://developer.android.com/tools/variables#android_home for more details
This commit is contained in:
Fredia Huya-Kouadio
2023-11-01 09:17:19 -07:00
parent 37d51d2cb7
commit a1ca4bab47
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/detect.py
View File

@@ -21,7 +21,7 @@ def get_opts():
from SCons.Variables import BoolVariable from SCons.Variables import BoolVariable
return [ return [
("ANDROID_SDK_ROOT", "Path to the Android SDK", get_env_android_sdk_root()), ("ANDROID_HOME", "Path to the Android SDK", get_env_android_sdk_root()),
( (
"ndk_platform", "ndk_platform",
'Target platform (android-<api>, e.g. "android-' + str(get_min_target_api()) + '")', 'Target platform (android-<api>, e.g. "android-' + str(get_min_target_api()) + '")',
@@ -41,9 +41,9 @@ def get_doc_path():
return "doc_classes" return "doc_classes"
# Return the ANDROID_SDK_ROOT environment variable. # Return the ANDROID_HOME environment variable.
def get_env_android_sdk_root(): def get_env_android_sdk_root():
return os.environ.get("ANDROID_SDK_ROOT", -1) return os.environ.get("ANDROID_HOME", os.environ.get("ANDROID_SDK_ROOT", ""))
def get_min_sdk_version(platform): def get_min_sdk_version(platform):
@@ -51,7 +51,7 @@ def get_min_sdk_version(platform):
def get_android_ndk_root(env): def get_android_ndk_root(env):
return env["ANDROID_SDK_ROOT"] + "/ndk/" + get_ndk_version() return env["ANDROID_HOME"] + "/ndk/" + get_ndk_version()
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'. # This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
@@ -75,7 +75,7 @@ def get_flags():
# If not, install it. # If not, install it.
def install_ndk_if_needed(env): def install_ndk_if_needed(env):
print("Checking for Android NDK...") print("Checking for Android NDK...")
sdk_root = env["ANDROID_SDK_ROOT"] sdk_root = env["ANDROID_HOME"]
if not os.path.exists(get_android_ndk_root(env)): if not os.path.exists(get_android_ndk_root(env)):
extension = ".bat" if os.name == "nt" else "" extension = ".bat" if os.name == "nt" else ""
sdkmanager = sdk_root + "/cmdline-tools/latest/bin/sdkmanager" + extension sdkmanager = sdk_root + "/cmdline-tools/latest/bin/sdkmanager" + extension
@@ -87,7 +87,7 @@ def install_ndk_if_needed(env):
else: else:
print("Cannot find " + sdkmanager) print("Cannot find " + sdkmanager)
print( print(
"Please ensure ANDROID_SDK_ROOT is correct and cmdline-tools are installed, or install NDK version " "Please ensure ANDROID_HOME is correct and cmdline-tools are installed, or install NDK version "
+ get_ndk_version() + get_ndk_version()
+ " manually." + " manually."
) )

2
platform/android/export/export.cpp
View File

@@ -42,7 +42,7 @@ void register_android_exporter_types() {
void register_android_exporter() { void register_android_exporter() {
#ifndef ANDROID_ENABLED #ifndef ANDROID_ENABLED
EDITOR_DEF("export/android/android_sdk_path", OS::get_singleton()->get_environment("ANDROID_SDK_ROOT")); EDITOR_DEF("export/android/android_sdk_path", OS::get_singleton()->get_environment("ANDROID_HOME"));
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/android_sdk_path", PROPERTY_HINT_GLOBAL_DIR)); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/android_sdk_path", PROPERTY_HINT_GLOBAL_DIR));
EDITOR_DEF("export/android/debug_keystore", ""); EDITOR_DEF("export/android/debug_keystore", "");
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/debug_keystore", PROPERTY_HINT_GLOBAL_FILE, "*.keystore,*.jks")); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/debug_keystore", PROPERTY_HINT_GLOBAL_FILE, "*.keystore,*.jks"));