godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Merge pull request #43671 from m4gr3d/fix_zipalign_bug_on_windows

Browse Source 
Fix zipalign command name on Windows machines
This commit is contained in:
Rémi Verschelde
2020-11-19 09:00:47 +01:00
committed by GitHub
parent 2ca1c17a5c c4f2d87747
commit 319126a039
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/export/export.cpp
View File

@@ -2269,6 +2269,13 @@ public:
Error _zip_align_project(const String &sdk_path, const String &unaligned_file_path, const String &aligned_file_path) { Error _zip_align_project(const String &sdk_path, const String &unaligned_file_path, const String &aligned_file_path) {
// Look for the zipalign tool. // Look for the zipalign tool.
String zipalign_command_name;
#ifdef WINDOWS_ENABLED
zipalign_command_name = "zipalign.exe";
#else
zipalign_command_name = "zipalign";
#endif
String zipalign_command; String zipalign_command;
Error errn; Error errn;
String build_tools_dir = sdk_path.plus_file("build-tools"); String build_tools_dir = sdk_path.plus_file("build-tools");
@@ -2283,7 +2290,7 @@ public:
while (!sub_dir.empty()) { while (!sub_dir.empty()) {
if (!sub_dir.begins_with(".") && da->current_is_dir()) { if (!sub_dir.begins_with(".") && da->current_is_dir()) {
// Check if the tool is here. // Check if the tool is here.
String tool_path = build_tools_dir.plus_file(sub_dir).plus_file("zipalign"); String tool_path = build_tools_dir.plus_file(sub_dir).plus_file(zipalign_command_name);
if (FileAccess::exists(tool_path)) { if (FileAccess::exists(tool_path)) {
zipalign_command = tool_path; zipalign_command = tool_path;
break; break;