Merge pull request #43671 from m4gr3d/fix_zipalign_bug_on_windows

Fix zipalign command name on Windows machines
godotengine · Nov 19, 2020 · 319126a · 319126a
2 parents 2ca1c17 + c4f2d87
commit 319126a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
@@ -2269,6 +2269,13 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 
 	Error _zip_align_project(const String &sdk_path, const String &unaligned_file_path, const String &aligned_file_path) {
 		// 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;
 		Error errn;
 		String build_tools_dir = sdk_path.plus_file("build-tools");
@@ -2283,7 +2290,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 		while (!sub_dir.empty()) {
 			if (!sub_dir.begins_with(".") && da->current_is_dir()) {
 				// 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)) {
 					zipalign_command = tool_path;
 					break;