diff --git a/platform/android/export/android_editor_gradle_runner.cpp b/platform/android/export/android_editor_gradle_runner.cpp index 0ee0e67a9d..199776b694 100644 --- a/platform/android/export/android_editor_gradle_runner.cpp +++ b/platform/android/export/android_editor_gradle_runner.cpp @@ -39,10 +39,11 @@ #include "../java_godot_wrapper.h" #include "../os_android.h" -void AndroidEditorGradleRunner::run_gradle(const String &p_project_path, const String &p_build_path, const String &p_output_path, const List &p_gradle_build_args, const List &p_gradle_copy_args) { +void AndroidEditorGradleRunner::run_gradle(const String &p_project_path, const String &p_build_path, const String &p_output_path, const String &p_export_format, const List &p_gradle_build_args, const List &p_gradle_copy_args) { project_path = p_project_path; build_path = p_build_path; output_path = p_output_path; + export_format = p_export_format; gradle_build_args = p_gradle_build_args; gradle_copy_args = p_gradle_copy_args; @@ -155,7 +156,7 @@ void AndroidEditorGradleRunner::_android_gradle_build_clean_project(bool p_was_s output_dialog->hide(); bool prompt_apk_install = EDITOR_GET("export/android/install_exported_apk"); - if (prompt_apk_install) { + if (prompt_apk_install && export_format == "apk") { OS_Android::get_singleton()->shell_open(output_path); } } else { diff --git a/platform/android/export/android_editor_gradle_runner.h b/platform/android/export/android_editor_gradle_runner.h index 502bf094ca..916dfb0826 100644 --- a/platform/android/export/android_editor_gradle_runner.h +++ b/platform/android/export/android_editor_gradle_runner.h @@ -53,6 +53,7 @@ class AndroidEditorGradleRunner : public Object { String project_path; String build_path; String output_path; + String export_format; List gradle_build_args; List gradle_copy_args; int64_t job_id; @@ -71,7 +72,7 @@ class AndroidEditorGradleRunner : public Object { void _android_gradle_build_cancel(); public: - void run_gradle(const String &p_project_path, const String &p_build_path, const String &p_output_path, const List &p_gradle_build_args, const List &p_gradle_copy_args); + void run_gradle(const String &p_project_path, const String &p_build_path, const String &p_output_path, const String &p_export_format, const List &p_gradle_build_args, const List &p_gradle_copy_args); }; #endif // ANDROID_ENABLED diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index d443fbb4ae..a5020db29f 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -3958,6 +3958,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref