Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Only attempt install when export format is APK

Browse source
This commit is contained in:
Anish Kumar 2025-12-28 05:11:30 +05:30
parent 63227bbc8a
commit a797a2f5f7
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
platform/android/export/android_editor_gradle_runner.cpp
View file

@ -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<String> &p_gradle_build_args, const List<String> &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<String> &p_gradle_build_args, const List<String> &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 {

3
platform/android/export/android_editor_gradle_runner.h
View file

@ -53,6 +53,7 @@ class AndroidEditorGradleRunner : public Object {
String project_path;
String build_path;
String output_path;
String export_format;
List<String> gradle_build_args;
List<String> 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<String> &p_gradle_build_args, const List<String> &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<String> &p_gradle_build_args, const List<String> &p_gradle_copy_args);
};
#endif // ANDROID_ENABLED

1
platform/android/export/export_plugin.cpp
View file

@ -3958,6 +3958,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
project_path,
build_path.substr(project_path.length()),
export_path.path_join(export_filename),
export_format_arg,
cmdline,
copy_args);
#else