summaryrefslogtreecommitdiff
path: root/platform/android/export
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-10-03 11:06:54 +0200
committerRémi Verschelde <rverschelde@gmail.com>2019-10-03 12:13:45 +0200
commit0c7b3fff44f7945977c06575233e51ef6f4e7910 (patch)
tree97f48367df2aa34ccdbf875f93aec1fc4265d960 /platform/android/export
parentcd408c7f066be1277fe6684e5bdba42058f4e14d (diff)
Android: Fix manifest parsing and APK names in export code
A better fix would be to make Godot's export code properly parse the tag over multiple lines (and maybe even use XMLParser instead of doing it ad-hoc?). As for the APK names, we could alternatively pick the first .apk found in the `debug` and `release` folders without expecting a specific name. Fixes #32414.
Diffstat (limited to 'platform/android/export')
-rw-r--r--platform/android/export/export.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 94dffd8a84..2cd8195615 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1875,7 +1875,7 @@ public:
new_file += "<!--CHUNK_" + text + "_BEGIN-->\n";
if (!found) {
- ERR_PRINTS("No end marker found in AndroidManifest.conf for chunk: " + text);
+ ERR_PRINTS("No end marker found in AndroidManifest.xml for chunk: " + text);
f->seek(pos);
} else {
//add chunk lines
@@ -1894,7 +1894,7 @@ public:
String last_tag = "android:icon=\"@drawable/icon\"";
int last_tag_pos = l.find(last_tag);
if (last_tag_pos == -1) {
- WARN_PRINTS("No adding of application tags because could not find last tag for <application: " + last_tag);
+ ERR_PRINTS("Not adding application attributes as the expected tag was not found in '<application': " + last_tag);
new_file += l + "\n";
} else {
String base = l.substr(0, last_tag_pos + last_tag.length());
@@ -1980,9 +1980,9 @@ public:
return ERR_CANT_CREATE;
}
if (p_debug) {
- src_apk = build_path.plus_file("build/outputs/apk/debug/build-debug-unsigned.apk");
+ src_apk = build_path.plus_file("build/outputs/apk/debug/android_debug.apk");
} else {
- src_apk = build_path.plus_file("build/outputs/apk/release/build-release-unsigned.apk");
+ src_apk = build_path.plus_file("build/outputs/apk/release/android_release.apk");
}
if (!FileAccess::exists(src_apk)) {