aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde2016-03-20 11:51:50 +0100
committerRémi Verschelde2016-04-02 22:14:20 +0200
commit5caf6ad8b910abfa4014e1a66d2417c590578639 (patch)
tree7858529d61fcae9b0aa9d4aef7b7273f7f54e9ac
parent7ddc17b18ec9f6fb557b1fa0cfeac97c4b009695 (diff)
downloadgodot-5caf6ad8b910abfa4014e1a66d2417c590578639.tar.gz
godot-5caf6ad8b910abfa4014e1a66d2417c590578639.tar.zst
godot-5caf6ad8b910abfa4014e1a66d2417c590578639.zip
Expose android/shutdown_adb_on_exit parameter and default to true
It was added in 30d0ca9 for the Steam build but only enabled when parsing a ._sc_ file that would define it. It is now available for all users to toggle, in and outside of Steam. Fixes #4073. (cherry picked from commit c58494038702876403687e5b76a100f077b8d9b3)
-rw-r--r--platform/android/export/export.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index e65a712a1..60f4e61c6 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1772,6 +1772,7 @@ void register_android_exporter() {
//EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore"));
EDITOR_DEF("android/timestamping_authority_url","");
EDITOR_DEF("android/use_remote_debug_over_adb",false);
+ EDITOR_DEF("android/shutdown_adb_on_exit",true);
Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) );
EditorImportExport::get_singleton()->add_export_platform(exporter);