summaryrefslogtreecommitdiff
path: root/platform/android/java
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/java
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/java')
-rw-r--r--platform/android/java/app/AndroidManifest.xml7
1 files changed, 2 insertions, 5 deletions
diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml
index d5f4ba18d6..ba01ec313b 100644
--- a/platform/android/java/app/AndroidManifest.xml
+++ b/platform/android/java/app/AndroidManifest.xml
@@ -26,11 +26,8 @@
<!-- 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. -->
- <application
- android:label="@string/godot_project_name_string"
- android:allowBackup="false"
- tools:ignore="GoogleAppIndexingWarning"
- android:icon="@drawable/icon" >
+ <!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
+ <application android:label="@string/godot_project_name_string" 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. -->
<!-- Do these changes in the export preset. Adding new ones is fine. -->