From 0c7b3fff44f7945977c06575233e51ef6f4e7910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 3 Oct 2019 11:06:54 +0200
Subject: 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.
---
 platform/android/java/app/AndroidManifest.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'platform/android/java')

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. -->
-- 
cgit v1.2.3