diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-06 11:06:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 11:06:08 +0000 |
| commit | e7894c2c4efdd51049a21af4892005381fe57cd6 (patch) | |
| tree | 849c2d29b6fb90100f31de20340d5f0ef4238edf /platform/android/export/export.cpp | |
| parent | d14f2a31558686f00c4f351ea659918576711a7a (diff) | |
| parent | b8b8a7127e3040582c5937fd2dff4c99e94a3b57 (diff) | |
| download | redot-engine-e7894c2c4efdd51049a21af4892005381fe57cd6.tar.gz | |
Merge pull request #843 from Spartan322/merge/87318a2
Merge commit godotengine/godot@87318a2
Diffstat (limited to 'platform/android/export/export.cpp')
| -rw-r--r-- | platform/android/export/export.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 03aed4c534..513d1be05b 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -51,7 +51,9 @@ void register_android_exporter() { EDITOR_DEF_BASIC("export/android/debug_keystore_pass", DEFAULT_ANDROID_KEYSTORE_DEBUG_PASSWORD); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/debug_keystore_pass", PROPERTY_HINT_PASSWORD)); -#ifndef ANDROID_ENABLED +#ifdef ANDROID_ENABLED + EDITOR_DEF_BASIC("export/android/install_exported_apk", true); +#else EDITOR_DEF_BASIC("export/android/java_sdk_path", OS::get_singleton()->get_environment("JAVA_HOME")); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/android/java_sdk_path", PROPERTY_HINT_GLOBAL_DIR)); EDITOR_DEF_BASIC("export/android/android_sdk_path", OS::get_singleton()->get_environment("ANDROID_HOME")); |