summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorAlessandro <alessandroperelli30@gmail.com>2018-08-20 17:35:33 +0200
committerAlessandro <alessandroperelli30@gmail.com>2018-08-20 17:38:23 +0200
commit9c1fd917321a65ba1900b7d137dd5868887392b2 (patch)
tree697556284604cd3a6ff5de869f0f1cbce05e25b0 /platform/android
parent75e540ce7259adbe1b1d4b22f2444078953da494 (diff)
fix Android/HTML5 custom templates option does not work
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/export/export.cpp18
1 files changed, 17 insertions, 1 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index fb19c5d33f..4537f6f326 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1333,12 +1333,28 @@ public:
virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+ String err;
r_missing_templates = find_export_template("android_debug.apk") == String() || find_export_template("android_release.apk") == String();
+ if (p_preset->get("custom_package/debug") != "") {
+ if (FileAccess::exists(p_preset->get("custom_package/debug"))) {
+ r_missing_templates = false;
+ } else {
+ err += "Custom debug package not found.\n";
+ }
+ }
+
+ if (p_preset->get("custom_package/release") != "") {
+ if (FileAccess::exists(p_preset->get("custom_package/release"))) {
+ r_missing_templates = false;
+ } else {
+ err += "Custom release package not found.\n";
+ }
+ }
+
bool valid = !r_missing_templates;
String adb = EditorSettings::get_singleton()->get("export/android/adb");
- String err;
if (!FileAccess::exists(adb)) {