godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87823 from KoBeWi/ban_adb

Browse Source 
Don't invoke adb with no runnable Android preset
This commit is contained in:
Rémi Verschelde
2024-02-17 15:54:49 +01:00
parent 2c5fa95aea 343bfb112f
commit e697774f61
7 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/export/export_plugin.h
View File

@@ -98,8 +98,10 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
#ifndef ANDROID_ENABLED
Thread check_for_changes_thread;
SafeFlag quit_request;
SafeFlag has_runnable_preset;
static void _check_for_changes_poll_thread(void *ud);
void _update_preset_status();
#endif
String get_project_name(const String &p_name) const;
@@ -187,10 +189,12 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
static bool _uses_vulkan();
protected:
void _notification(int p_what);
public:
typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key);
public:
virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const override;
virtual void get_export_options(List<ExportOption> *r_options) const override;