Merge pull request #84286 from m4gr3d/auto_set_android_sdk_default_3x

[3.x] Automatically pick the Android sdk path using environment variables
This commit is contained in:
Rémi Verschelde 2023-11-14 11:37:36 +01:00
commit 2bbfc379df
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -32,9 +32,11 @@
#include "export_plugin.h"
#include "core/os/os.h"
void register_android_exporter() {
#ifndef ANDROID_ENABLED
EDITOR_DEF("export/android/android_sdk_path", "");
EDITOR_DEF("export/android/android_sdk_path", OS::get_singleton()->get_environment("ANDROID_SDK_ROOT"));
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/android_sdk_path", PROPERTY_HINT_GLOBAL_DIR));
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"));