godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Fix invalid missing template error when the Android build template is not installed.

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2021-02-26 12:28:19 -08:00
parent 7b685a1558
commit 6f0ca6c9f7
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/export/export.cpp
View File

@@ -2003,6 +2003,7 @@ public:
String template_err; String template_err;
bool dvalid = false; bool dvalid = false;
bool rvalid = false; bool rvalid = false;
bool has_export_templates = false;
if (p_preset->get("custom_template/debug") != "") { if (p_preset->get("custom_template/debug") != "") {
dvalid = FileAccess::exists(p_preset->get("custom_template/debug")); dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
@@ -2010,7 +2011,7 @@ public:
template_err += TTR("Custom debug template not found.") + "\n"; template_err += TTR("Custom debug template not found.") + "\n";
} }
} else { } else {
dvalid = exists_export_template("android_debug.apk", &template_err); has_export_templates |= exists_export_template("android_debug.apk", &template_err);
} }
if (p_preset->get("custom_template/release") != "") { if (p_preset->get("custom_template/release") != "") {
@@ -2019,22 +2020,24 @@ public:
template_err += TTR("Custom release template not found.") + "\n"; template_err += TTR("Custom release template not found.") + "\n";
} }
} else { } else {
rvalid = exists_export_template("android_release.apk", &template_err); has_export_templates |= exists_export_template("android_release.apk", &template_err);
} }
valid = dvalid || rvalid; r_missing_templates = !has_export_templates;
valid = dvalid || rvalid || has_export_templates;
if (!valid) { if (!valid) {
err += template_err; err += template_err;
} }
} else { } else {
valid = exists_export_template("android_source.zip", &err); r_missing_templates = !exists_export_template("android_source.zip", &err);
if (!FileAccess::exists("res://android/build/build.gradle")) { bool installed_android_build_template = FileAccess::exists("res://android/build/build.gradle");
if (!installed_android_build_template) {
err += TTR("Android build template not installed in the project. Install it from the Project menu.") + "\n"; err += TTR("Android build template not installed in the project. Install it from the Project menu.") + "\n";
valid = false;
} }
valid = installed_android_build_template && !r_missing_templates;
} }
r_missing_templates = !valid;
// Validate the rest of the configuration. // Validate the rest of the configuration.