diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-19 15:20:23 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-19 15:20:23 -0600 |
| commit | 650e96b76862e9ef4b79efd7a0801eb4596b824c (patch) | |
| tree | 24a8d767c91da22265f1f64c381ada037ee5e017 /platform/android/export/export_plugin.cpp | |
| parent | 3a4feeda898e1c6961225568696700642ad94628 (diff) | |
| parent | 728927425f7cf32390d9b059cac6b51d281c8212 (diff) | |
| download | redot-engine-650e96b76862e9ef4b79efd7a0801eb4596b824c.tar.gz | |
Merge pull request #99353 from syntaxerror247/some_uid_issues
Fix Android boot splash and gradle build issue
Diffstat (limited to 'platform/android/export/export_plugin.cpp')
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 0b506e60d6..e20de99c2d 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -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; } |