diff options
Diffstat (limited to 'platform/android/export/export.cpp')
| -rw-r--r-- | platform/android/export/export.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index d4755f4ed..0f1cbdc73 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1129,7 +1129,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d if (file=="lib/armeabi/libgodot_android.so" && !export_arm) { skip=true; } - + if (file.begins_with("META-INF") && _signed) { skip=true; } @@ -1493,6 +1493,16 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) { OS::get_singleton()->delay_usec(3000000); } + if (EditorSettings::get_singleton()->get("android/shutdown_adb_on_exit")) { + String adb=EditorSettings::get_singleton()->get("android/adb"); + if (!FileAccess::exists(adb)) { + return; //adb not configured + } + + List<String> args; + args.push_back("kill-server"); + OS::get_singleton()->execute(adb,args,true); + }; } Error EditorExportPlatformAndroid::run(int p_device, int p_flags) { |