diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-17 00:23:32 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-17 00:23:32 +0100 |
| commit | 66b33c15e42005bfd4c60c4c50805a0aaf5a2c80 (patch) | |
| tree | 800a638ac75e389dfac0aa3ca873eaab48ce7673 /platform/android/export/export_plugin.h | |
| parent | c28493ad048f65bdcd62f6be7558fa7b442ea801 (diff) | |
| parent | a37ad265dc818d2aeaec97e1559ecae42e5487e2 (diff) | |
| download | redot-engine-66b33c15e42005bfd4c60c4c50805a0aaf5a2c80.tar.gz | |
Merge pull request #88297 from dsnopek/android-configure-gradle-path
Android: Allow using alternative Gradle build directory
Diffstat (limited to 'platform/android/export/export_plugin.h')
| -rw-r--r-- | platform/android/export/export_plugin.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h index c282055fba..abc462a691 100644 --- a/platform/android/export/export_plugin.h +++ b/platform/android/export/export_plugin.h @@ -90,6 +90,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { #endif // DISABLE_DEPRECATED String last_plugin_names; uint64_t last_gradle_build_time = 0; + String last_gradle_build_dir; Vector<Device> devices; SafeFlag devices_changed; @@ -174,10 +175,6 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { void load_icon_refs(const Ref<EditorExportPreset> &p_preset, Ref<Image> &icon, Ref<Image> &foreground, Ref<Image> &background); - void store_image(const LauncherIcon launcher_icon, const Vector<uint8_t> &data); - - void store_image(const String &export_path, const Vector<uint8_t> &data); - void _copy_icons_to_gradle_project(const Ref<EditorExportPreset> &p_preset, const String &processed_splash_config_xml, const Ref<Image> &splash_image, @@ -198,6 +195,8 @@ public: virtual void get_export_options(List<ExportOption> *r_options) const override; + virtual bool get_export_option_visibility(const EditorExportPreset *p_preset, const String &p_option) const override; + virtual String get_export_option_warning(const EditorExportPreset *p_preset, const StringName &p_name) const override; virtual String get_name() const override; @@ -248,9 +247,9 @@ public: Error sign_apk(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &export_path, EditorProgress &ep); - void _clear_assets_directory(); + void _clear_assets_directory(const Ref<EditorExportPreset> &p_preset); - void _remove_copied_libs(); + void _remove_copied_libs(String p_gdextension_libs_path); static String join_list(const List<String> &p_parts, const String &p_separator); static String join_abis(const Vector<ABI> &p_parts, const String &p_separator, bool p_use_arch); |