godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32515 from akien-mga/android-custom-build-fix-manifest

Browse Source 
Android: Fix manifest to match Godot export code
This commit is contained in:
Rémi Verschelde 2019-10-03 12:33:26 +02:00 committed by GitHub
commit 393aa8ff86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1875,7 +1875,7 @@ public:
new_file += "<!--CHUNK_" + text + "_BEGIN-->\n"; new_file += "<!--CHUNK_" + text + "_BEGIN-->\n";
if (!found) { 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); f->seek(pos);
} else { } else {
//add chunk lines //add chunk lines
@ -1894,7 +1894,7 @@ public:
String last_tag = "android:icon=\"@drawable/icon\""; String last_tag = "android:icon=\"@drawable/icon\"";
int last_tag_pos = l.find(last_tag); int last_tag_pos = l.find(last_tag);
if (last_tag_pos == -1) { 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"; new_file += l + "\n";
} else { } else {
String base = l.substr(0, last_tag_pos + last_tag.length()); String base = l.substr(0, last_tag_pos + last_tag.length());
@ -1980,9 +1980,9 @@ public:
return ERR_CANT_CREATE; return ERR_CANT_CREATE;
} }
if (p_debug) { 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 { } 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)) { if (!FileAccess::exists(src_apk)) {

7
platform/android/java/app/AndroidManifest.xml
View File

@ -26,11 +26,8 @@
<!-- Any tag in this line after android:icon will be erased when doing custom builds. --> <!-- Any tag in this line after android:icon will be erased when doing custom builds. -->
<!-- If you want to add tags manually, do before it. --> <!-- If you want to add tags manually, do before it. -->
<application <!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
android:label="@string/godot_project_name_string" <application android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@drawable/icon" >
android:allowBackup="false"
tools:ignore="GoogleAppIndexingWarning"
android:icon="@drawable/icon" >
<!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. --> <!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. -->
<!-- Do these changes in the export preset. Adding new ones is fine. --> <!-- Do these changes in the export preset. Adding new ones is fine. -->