godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #110248 from KoBeWi/unexpected_include_hell

Browse Source 
Misc cleanup in EditorExportPlatform
This commit is contained in:
Thaddeus Crews
2025-11-04 16:32:39 -06:00
parent 38eefbab28 1c1c3200e4
commit 90cab74af9
21 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/export/export_plugin.cpp
View File

@@ -801,11 +801,7 @@ 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 simplified_path = p_path.simplify_path();
if (simplified_path.begins_with("uid://")) {
simplified_path = ResourceUID::uid_to_path(simplified_path).simplify_path();
print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, simplified_path));
}
const String simplified_path = simplify_path(p_path);
Vector<uint8_t> enc_data;
EditorExportPlatform::SavedData sd;