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

Merge pull request #50234 from akien-mga/3.x-android-fix-50224 

Android: Fix truncated `application` attributes after #50028 cherry-pick
This commit is contained in:
Rémi Verschelde 2021-07-07 01:28:46 +02:00 committed by GitHub
parent 031a034a28 46c68c0fb9
commit e5b32eda8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/export/gradle_export_util.h
View File

@ -264,11 +264,11 @@ String _get_application_tag(const Ref<EditorExportPreset> &p_preset, bool p_has_
String manifest_application_text = vformat( String manifest_application_text = vformat(
" <application android:label=\"@string/godot_project_name_string\"\n" " <application android:label=\"@string/godot_project_name_string\"\n"
" android:allowBackup=\"%s\"\n" " android:allowBackup=\"%s\"\n"
" android:icon=\"@mipmap/icon\"\n"
" android:isGame=\"%s\"\n" " android:isGame=\"%s\"\n"
" android:requestLegacyExternalStorage=\"%s\"\n" " android:requestLegacyExternalStorage=\"%s\"\n"
" tools:replace=\"android:allowBackup,android:isGame,android:requestLegacyExternalStorage\"\n" " tools:replace=\"android:allowBackup,android:isGame,android:requestLegacyExternalStorage\"\n"
" tools:ignore=\"GoogleAppIndexingWarning\">\n\n" " tools:ignore=\"GoogleAppIndexingWarning\"\n"
" android:icon=\"@mipmap/icon\" >\n\n"
" <meta-data tools:node=\"remove\" android:name=\"xr_mode_metadata_name\" />\n", " <meta-data tools:node=\"remove\" android:name=\"xr_mode_metadata_name\" />\n",
bool_to_string(p_preset->get("user_data_backup/allow")), bool_to_string(p_preset->get("user_data_backup/allow")),
bool_to_string(p_preset->get("package/classify_as_game")), bool_to_string(p_preset->get("package/classify_as_game")),

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

@ -28,7 +28,7 @@
<!-- If you want to add tags manually, do before it. --> <!-- If you want to add tags manually, do before it. -->
<!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. --> <!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
<!-- TODO: Remove the 'requestLegacyExternalStorage' attribute when https://github.com/godotengine/godot/issues/38913 is resolved --> <!-- TODO: Remove the 'requestLegacyExternalStorage' attribute when https://github.com/godotengine/godot/issues/38913 is resolved -->
<application android:label="@string/godot_project_name_string" android:allowBackup="false" android:icon="@mipmap/icon" android:isGame="true" android:requestLegacyExternalStorage="false" tools:ignore="GoogleAppIndexingWarning" > <application android:label="@string/godot_project_name_string" android:allowBackup="false" android:isGame="true" android:requestLegacyExternalStorage="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon" >
<!-- Records the version of the Godot editor used for building --> <!-- Records the version of the Godot editor used for building -->
<meta-data <meta-data