Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #99353 from syntaxerror247/some_uid_issues

Browse source 
Fix Android boot splash and gradle build issue
This commit is contained in:
Thaddeus Crews 2024-11-19 15:20:23 -06:00
commit 650e96b768
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
platform/android/export/export_plugin.cpp
View file

@ -790,9 +790,10 @@ Error EditorExportPlatformAndroid::save_apk_so(void *p_userdata, const SharedObj
Error EditorExportPlatformAndroid::save_apk_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed) {
APKExportData *ed = static_cast<APKExportData *>(p_userdata);
String dst_path = p_path.replace_first("res://", "assets/");
const String path = ResourceUID::ensure_path(p_path);
const String dst_path = path.replace_first("res://", "assets/");
store_in_apk(ed, dst_path, p_data, _should_compress_asset(p_path, p_data) ? Z_DEFLATED : 0);
store_in_apk(ed, dst_path, p_data, _should_compress_asset(path, p_data) ? Z_DEFLATED : 0);
return OK;
}