Merge pull request #50771 from naithar/feature/platform-export-refactoring-4.0

29 files changed, 10076 insertions, 9225 deletions

diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 1795bbe523..fc86abb6f1 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -30,3021 +30,7 @@
 
 #include "export.h"
 
-#include "core/config/project_settings.h"
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/image_loader.h"
-#include "core/io/json.h"
-#include "core/io/marshalls.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
-#include "core/templates/safe_refcount.h"
-#include "core/version.h"
-#include "drivers/png/png_driver_common.h"
-#include "editor/editor_export.h"
-#include "editor/editor_log.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "main/splash.gen.h"
-#include "platform/android/export/gradle_export_util.h"
-#include "platform/android/logo.gen.h"
-#include "platform/android/plugin/godot_plugin_config.h"
-#include "platform/android/run_icon.gen.h"
-
-#include <string.h>
-
-static const char *android_perms[] = {
-	"ACCESS_CHECKIN_PROPERTIES",
-	"ACCESS_COARSE_LOCATION",
-	"ACCESS_FINE_LOCATION",
-	"ACCESS_LOCATION_EXTRA_COMMANDS",
-	"ACCESS_MOCK_LOCATION",
-	"ACCESS_NETWORK_STATE",
-	"ACCESS_SURFACE_FLINGER",
-	"ACCESS_WIFI_STATE",
-	"ACCOUNT_MANAGER",
-	"ADD_VOICEMAIL",
-	"AUTHENTICATE_ACCOUNTS",
-	"BATTERY_STATS",
-	"BIND_ACCESSIBILITY_SERVICE",
-	"BIND_APPWIDGET",
-	"BIND_DEVICE_ADMIN",
-	"BIND_INPUT_METHOD",
-	"BIND_NFC_SERVICE",
-	"BIND_NOTIFICATION_LISTENER_SERVICE",
-	"BIND_PRINT_SERVICE",
-	"BIND_REMOTEVIEWS",
-	"BIND_TEXT_SERVICE",
-	"BIND_VPN_SERVICE",
-	"BIND_WALLPAPER",
-	"BLUETOOTH",
-	"BLUETOOTH_ADMIN",
-	"BLUETOOTH_PRIVILEGED",
-	"BRICK",
-	"BROADCAST_PACKAGE_REMOVED",
-	"BROADCAST_SMS",
-	"BROADCAST_STICKY",
-	"BROADCAST_WAP_PUSH",
-	"CALL_PHONE",
-	"CALL_PRIVILEGED",
-	"CAMERA",
-	"CAPTURE_AUDIO_OUTPUT",
-	"CAPTURE_SECURE_VIDEO_OUTPUT",
-	"CAPTURE_VIDEO_OUTPUT",
-	"CHANGE_COMPONENT_ENABLED_STATE",
-	"CHANGE_CONFIGURATION",
-	"CHANGE_NETWORK_STATE",
-	"CHANGE_WIFI_MULTICAST_STATE",
-	"CHANGE_WIFI_STATE",
-	"CLEAR_APP_CACHE",
-	"CLEAR_APP_USER_DATA",
-	"CONTROL_LOCATION_UPDATES",
-	"DELETE_CACHE_FILES",
-	"DELETE_PACKAGES",
-	"DEVICE_POWER",
-	"DIAGNOSTIC",
-	"DISABLE_KEYGUARD",
-	"DUMP",
-	"EXPAND_STATUS_BAR",
-	"FACTORY_TEST",
-	"FLASHLIGHT",
-	"FORCE_BACK",
-	"GET_ACCOUNTS",
-	"GET_PACKAGE_SIZE",
-	"GET_TASKS",
-	"GET_TOP_ACTIVITY_INFO",
-	"GLOBAL_SEARCH",
-	"HARDWARE_TEST",
-	"INJECT_EVENTS",
-	"INSTALL_LOCATION_PROVIDER",
-	"INSTALL_PACKAGES",
-	"INSTALL_SHORTCUT",
-	"INTERNAL_SYSTEM_WINDOW",
-	"INTERNET",
-	"KILL_BACKGROUND_PROCESSES",
-	"LOCATION_HARDWARE",
-	"MANAGE_ACCOUNTS",
-	"MANAGE_APP_TOKENS",
-	"MANAGE_DOCUMENTS",
-	"MASTER_CLEAR",
-	"MEDIA_CONTENT_CONTROL",
-	"MODIFY_AUDIO_SETTINGS",
-	"MODIFY_PHONE_STATE",
-	"MOUNT_FORMAT_FILESYSTEMS",
-	"MOUNT_UNMOUNT_FILESYSTEMS",
-	"NFC",
-	"PERSISTENT_ACTIVITY",
-	"PROCESS_OUTGOING_CALLS",
-	"READ_CALENDAR",
-	"READ_CALL_LOG",
-	"READ_CONTACTS",
-	"READ_EXTERNAL_STORAGE",
-	"READ_FRAME_BUFFER",
-	"READ_HISTORY_BOOKMARKS",
-	"READ_INPUT_STATE",
-	"READ_LOGS",
-	"READ_PHONE_STATE",
-	"READ_PROFILE",
-	"READ_SMS",
-	"READ_SOCIAL_STREAM",
-	"READ_SYNC_SETTINGS",
-	"READ_SYNC_STATS",
-	"READ_USER_DICTIONARY",
-	"REBOOT",
-	"RECEIVE_BOOT_COMPLETED",
-	"RECEIVE_MMS",
-	"RECEIVE_SMS",
-	"RECEIVE_WAP_PUSH",
-	"RECORD_AUDIO",
-	"REORDER_TASKS",
-	"RESTART_PACKAGES",
-	"SEND_RESPOND_VIA_MESSAGE",
-	"SEND_SMS",
-	"SET_ACTIVITY_WATCHER",
-	"SET_ALARM",
-	"SET_ALWAYS_FINISH",
-	"SET_ANIMATION_SCALE",
-	"SET_DEBUG_APP",
-	"SET_ORIENTATION",
-	"SET_POINTER_SPEED",
-	"SET_PREFERRED_APPLICATIONS",
-	"SET_PROCESS_LIMIT",
-	"SET_TIME",
-	"SET_TIME_ZONE",
-	"SET_WALLPAPER",
-	"SET_WALLPAPER_HINTS",
-	"SIGNAL_PERSISTENT_PROCESSES",
-	"STATUS_BAR",
-	"SUBSCRIBED_FEEDS_READ",
-	"SUBSCRIBED_FEEDS_WRITE",
-	"SYSTEM_ALERT_WINDOW",
-	"TRANSMIT_IR",
-	"UNINSTALL_SHORTCUT",
-	"UPDATE_DEVICE_STATS",
-	"USE_CREDENTIALS",
-	"USE_SIP",
-	"VIBRATE",
-	"WAKE_LOCK",
-	"WRITE_APN_SETTINGS",
-	"WRITE_CALENDAR",
-	"WRITE_CALL_LOG",
-	"WRITE_CONTACTS",
-	"WRITE_EXTERNAL_STORAGE",
-	"WRITE_GSERVICES",
-	"WRITE_HISTORY_BOOKMARKS",
-	"WRITE_PROFILE",
-	"WRITE_SECURE_SETTINGS",
-	"WRITE_SETTINGS",
-	"WRITE_SMS",
-	"WRITE_SOCIAL_STREAM",
-	"WRITE_SYNC_SETTINGS",
-	"WRITE_USER_DICTIONARY",
-	nullptr
-};
-
-static const char *SPLASH_IMAGE_EXPORT_PATH = "res/drawable-nodpi/splash.png";
-static const char *LEGACY_BUILD_SPLASH_IMAGE_EXPORT_PATH = "res/drawable-nodpi-v4/splash.png";
-static const char *SPLASH_BG_COLOR_PATH = "res/drawable-nodpi/splash_bg_color.png";
-static const char *LEGACY_BUILD_SPLASH_BG_COLOR_PATH = "res/drawable-nodpi-v4/splash_bg_color.png";
-static const char *SPLASH_CONFIG_PATH = "res://android/build/res/drawable/splash_drawable.xml";
-static const char *GDNATIVE_LIBS_PATH = "res://android/build/libs/gdnativelibs.json";
-
-const String SPLASH_CONFIG_XML_CONTENT = R"SPLASH(<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/splash_bg_color" />
-	<item>
-		<bitmap
-				android:gravity="center"
-				android:filter="%s"
-				android:src="@drawable/splash" />
-	</item>
-</layer-list>
-)SPLASH";
-
-struct LauncherIcon {
-	const char *export_path;
-	int dimensions = 0;
-};
-
-static const int icon_densities_count = 6;
-static const char *launcher_icon_option = "launcher_icons/main_192x192";
-static const char *launcher_adaptive_icon_foreground_option = "launcher_icons/adaptive_foreground_432x432";
-static const char *launcher_adaptive_icon_background_option = "launcher_icons/adaptive_background_432x432";
-
-static const LauncherIcon launcher_icons[icon_densities_count] = {
-	{ "res/mipmap-xxxhdpi-v4/icon.png", 192 },
-	{ "res/mipmap-xxhdpi-v4/icon.png", 144 },
-	{ "res/mipmap-xhdpi-v4/icon.png", 96 },
-	{ "res/mipmap-hdpi-v4/icon.png", 72 },
-	{ "res/mipmap-mdpi-v4/icon.png", 48 },
-	{ "res/mipmap/icon.png", 192 }
-};
-
-static const LauncherIcon launcher_adaptive_icon_foregrounds[icon_densities_count] = {
-	{ "res/mipmap-xxxhdpi-v4/icon_foreground.png", 432 },
-	{ "res/mipmap-xxhdpi-v4/icon_foreground.png", 324 },
-	{ "res/mipmap-xhdpi-v4/icon_foreground.png", 216 },
-	{ "res/mipmap-hdpi-v4/icon_foreground.png", 162 },
-	{ "res/mipmap-mdpi-v4/icon_foreground.png", 108 },
-	{ "res/mipmap/icon_foreground.png", 432 }
-};
-
-static const LauncherIcon launcher_adaptive_icon_backgrounds[icon_densities_count] = {
-	{ "res/mipmap-xxxhdpi-v4/icon_background.png", 432 },
-	{ "res/mipmap-xxhdpi-v4/icon_background.png", 324 },
-	{ "res/mipmap-xhdpi-v4/icon_background.png", 216 },
-	{ "res/mipmap-hdpi-v4/icon_background.png", 162 },
-	{ "res/mipmap-mdpi-v4/icon_background.png", 108 },
-	{ "res/mipmap/icon_background.png", 432 }
-};
-
-static const int EXPORT_FORMAT_APK = 0;
-static const int EXPORT_FORMAT_AAB = 1;
-
-class EditorExportPlatformAndroid : public EditorExportPlatform {
-	GDCLASS(EditorExportPlatformAndroid, EditorExportPlatform);
-
-	Ref<ImageTexture> logo;
-	Ref<ImageTexture> run_icon;
-
-	struct Device {
-		String id;
-		String name;
-		String description;
-		int api_level = 0;
-	};
-
-	struct APKExportData {
-		zipFile apk;
-		EditorProgress *ep = nullptr;
-	};
-
-	struct CustomExportData {
-		bool debug;
-		Vector<String> libs;
-	};
-
-	Vector<PluginConfigAndroid> plugins;
-	String last_plugin_names;
-	uint64_t last_custom_build_time = 0;
-	SafeFlag plugins_changed;
-	Mutex plugins_lock;
-	Vector<Device> devices;
-	SafeFlag devices_changed;
-	Mutex device_lock;
-	Thread check_for_changes_thread;
-	SafeFlag quit_request;
-
-	static void _check_for_changes_poll_thread(void *ud) {
-		EditorExportPlatformAndroid *ea = (EditorExportPlatformAndroid *)ud;
-
-		while (!ea->quit_request.is_set()) {
-			// Check for plugins updates
-			{
-				// Nothing to do if we already know the plugins have changed.
-				if (!ea->plugins_changed.is_set()) {
-					Vector<PluginConfigAndroid> loaded_plugins = get_plugins();
-
-					MutexLock lock(ea->plugins_lock);
-
-					if (ea->plugins.size() != loaded_plugins.size()) {
-						ea->plugins_changed.set();
-					} else {
-						for (int i = 0; i < ea->plugins.size(); i++) {
-							if (ea->plugins[i].name != loaded_plugins[i].name) {
-								ea->plugins_changed.set();
-								break;
-							}
-						}
-					}
-
-					if (ea->plugins_changed.is_set()) {
-						ea->plugins = loaded_plugins;
-					}
-				}
-			}
-
-			// Check for devices updates
-			String adb = get_adb_path();
-			if (FileAccess::exists(adb)) {
-				String devices;
-				List<String> args;
-				args.push_back("devices");
-				int ec;
-				OS::get_singleton()->execute(adb, args, &devices, &ec);
-
-				Vector<String> ds = devices.split("\n");
-				Vector<String> ldevices;
-				for (int i = 1; i < ds.size(); i++) {
-					String d = ds[i];
-					int dpos = d.find("device");
-					if (dpos == -1) {
-						continue;
-					}
-					d = d.substr(0, dpos).strip_edges();
-					ldevices.push_back(d);
-				}
-
-				MutexLock lock(ea->device_lock);
-
-				bool different = false;
-
-				if (ea->devices.size() != ldevices.size()) {
-					different = true;
-				} else {
-					for (int i = 0; i < ea->devices.size(); i++) {
-						if (ea->devices[i].id != ldevices[i]) {
-							different = true;
-							break;
-						}
-					}
-				}
-
-				if (different) {
-					Vector<Device> ndevices;
-
-					for (int i = 0; i < ldevices.size(); i++) {
-						Device d;
-						d.id = ldevices[i];
-						for (int j = 0; j < ea->devices.size(); j++) {
-							if (ea->devices[j].id == ldevices[i]) {
-								d.description = ea->devices[j].description;
-								d.name = ea->devices[j].name;
-								d.api_level = ea->devices[j].api_level;
-							}
-						}
-
-						if (d.description == "") {
-							//in the oven, request!
-							args.clear();
-							args.push_back("-s");
-							args.push_back(d.id);
-							args.push_back("shell");
-							args.push_back("getprop");
-							int ec2;
-							String dp;
-
-							OS::get_singleton()->execute(adb, args, &dp, &ec2);
-
-							Vector<String> props = dp.split("\n");
-							String vendor;
-							String device;
-							d.description = "Device ID: " + d.id + "\n";
-							d.api_level = 0;
-							for (int j = 0; j < props.size(); j++) {
-								// got information by `shell cat /system/build.prop` before and its format is "property=value"
-								// it's now changed to use `shell getporp` because of permission issue with Android 8.0 and above
-								// its format is "[property]: [value]" so changed it as like build.prop
-								String p = props[j];
-								p = p.replace("]: ", "=");
-								p = p.replace("[", "");
-								p = p.replace("]", "");
-
-								if (p.begins_with("ro.product.model=")) {
-									device = p.get_slice("=", 1).strip_edges();
-								} else if (p.begins_with("ro.product.brand=")) {
-									vendor = p.get_slice("=", 1).strip_edges().capitalize();
-								} else if (p.begins_with("ro.build.display.id=")) {
-									d.description += "Build: " + p.get_slice("=", 1).strip_edges() + "\n";
-								} else if (p.begins_with("ro.build.version.release=")) {
-									d.description += "Release: " + p.get_slice("=", 1).strip_edges() + "\n";
-								} else if (p.begins_with("ro.build.version.sdk=")) {
-									d.api_level = p.get_slice("=", 1).to_int();
-								} else if (p.begins_with("ro.product.cpu.abi=")) {
-									d.description += "CPU: " + p.get_slice("=", 1).strip_edges() + "\n";
-								} else if (p.begins_with("ro.product.manufacturer=")) {
-									d.description += "Manufacturer: " + p.get_slice("=", 1).strip_edges() + "\n";
-								} else if (p.begins_with("ro.board.platform=")) {
-									d.description += "Chipset: " + p.get_slice("=", 1).strip_edges() + "\n";
-								} else if (p.begins_with("ro.opengles.version=")) {
-									uint32_t opengl = p.get_slice("=", 1).to_int();
-									d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl)&0xFF) + "\n";
-								}
-							}
-
-							d.name = vendor + " " + device;
-							if (device == String()) {
-								continue;
-							}
-						}
-
-						ndevices.push_back(d);
-					}
-
-					ea->devices = ndevices;
-					ea->devices_changed.set();
-				}
-			}
-
-			uint64_t sleep = 200;
-			uint64_t wait = 3000000;
-			uint64_t time = OS::get_singleton()->get_ticks_usec();
-			while (OS::get_singleton()->get_ticks_usec() - time < wait) {
-				OS::get_singleton()->delay_usec(1000 * sleep);
-				if (ea->quit_request.is_set()) {
-					break;
-				}
-			}
-		}
-
-		if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) {
-			String adb = get_adb_path();
-			if (!FileAccess::exists(adb)) {
-				return; //adb not configured
-			}
-
-			List<String> args;
-			args.push_back("kill-server");
-			OS::get_singleton()->execute(adb, args);
-		};
-	}
-
-	String get_project_name(const String &p_name) const {
-		String aname;
-		if (p_name != "") {
-			aname = p_name;
-		} else {
-			aname = ProjectSettings::get_singleton()->get("application/config/name");
-		}
-
-		if (aname == "") {
-			aname = VERSION_NAME;
-		}
-
-		return aname;
-	}
-
-	String get_package_name(const String &p_package) const {
-		String pname = p_package;
-		String basename = ProjectSettings::get_singleton()->get("application/config/name");
-		basename = basename.to_lower();
-
-		String name;
-		bool first = true;
-		for (int i = 0; i < basename.length(); i++) {
-			char32_t c = basename[i];
-			if (c >= '0' && c <= '9' && first) {
-				continue;
-			}
-			if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) {
-				name += String::chr(c);
-				first = false;
-			}
-		}
-		if (name == "") {
-			name = "noname";
-		}
-
-		pname = pname.replace("$genname", name);
-
-		return pname;
-	}
-
-	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const {
-		String pname = p_package;
-
-		if (pname.length() == 0) {
-			if (r_error) {
-				*r_error = TTR("Package name is missing.");
-			}
-			return false;
-		}
-
-		int segments = 0;
-		bool first = true;
-		for (int i = 0; i < pname.length(); i++) {
-			char32_t c = pname[i];
-			if (first && c == '.') {
-				if (r_error) {
-					*r_error = TTR("Package segments must be of non-zero length.");
-				}
-				return false;
-			}
-			if (c == '.') {
-				segments++;
-				first = true;
-				continue;
-			}
-			if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_')) {
-				if (r_error) {
-					*r_error = vformat(TTR("The character '%s' is not allowed in Android application package names."), String::chr(c));
-				}
-				return false;
-			}
-			if (first && (c >= '0' && c <= '9')) {
-				if (r_error) {
-					*r_error = TTR("A digit cannot be the first character in a package segment.");
-				}
-				return false;
-			}
-			if (first && c == '_') {
-				if (r_error) {
-					*r_error = vformat(TTR("The character '%s' cannot be the first character in a package segment."), String::chr(c));
-				}
-				return false;
-			}
-			first = false;
-		}
-
-		if (segments == 0) {
-			if (r_error) {
-				*r_error = TTR("The package must have at least one '.' separator.");
-			}
-			return false;
-		}
-
-		if (first) {
-			if (r_error) {
-				*r_error = TTR("Package segments must be of non-zero length.");
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	static bool _should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data) {
-		/*
-		 *  By not compressing files with little or not benefit in doing so,
-		 *  a performance gain is expected attime. Moreover, if the APK is
-		 *  zip-aligned, assets stored as they are can be efficiently read by
-		 *  Android by memory-mapping them.
-		 */
-
-		// -- Unconditional uncompress to mimic AAPT plus some other
-
-		static const char *unconditional_compress_ext[] = {
-			// From https://github.com/android/platform_frameworks_base/blob/master/tools/aapt/Package.cpp
-			// These formats are already compressed, or don't compress well:
-			".jpg", ".jpeg", ".png", ".gif",
-			".wav", ".mp2", ".mp3", ".ogg", ".aac",
-			".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet",
-			".rtttl", ".imy", ".xmf", ".mp4", ".m4a",
-			".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2",
-			".amr", ".awb", ".wma", ".wmv",
-			// Godot-specific:
-			".webp", // Same reasoning as .png
-			".cfb", // Don't let small config files slow-down startup
-			".scn", // Binary scenes are usually already compressed
-			".stex", // Streamable textures are usually already compressed
-			// Trailer for easier processing
-			nullptr
-		};
-
-		for (const char **ext = unconditional_compress_ext; *ext; ++ext) {
-			if (p_path.to_lower().ends_with(String(*ext))) {
-				return false;
-			}
-		}
-
-		// -- Compressed resource?
-
-		if (p_data.size() >= 4 && p_data[0] == 'R' && p_data[1] == 'S' && p_data[2] == 'C' && p_data[3] == 'C') {
-			// Already compressed
-			return false;
-		}
-
-		// --- TODO: Decide on texture resources according to their image compression setting
-
-		return true;
-	}
-
-	static zip_fileinfo get_zip_fileinfo() {
-		OS::Time time = OS::get_singleton()->get_time();
-		OS::Date date = OS::get_singleton()->get_date();
-
-		zip_fileinfo zipfi;
-		zipfi.tmz_date.tm_hour = time.hour;
-		zipfi.tmz_date.tm_mday = date.day;
-		zipfi.tmz_date.tm_min = time.minute;
-		zipfi.tmz_date.tm_mon = date.month - 1; // tm_mon is zero indexed
-		zipfi.tmz_date.tm_sec = time.second;
-		zipfi.tmz_date.tm_year = date.year;
-		zipfi.dosDate = 0;
-		zipfi.external_fa = 0;
-		zipfi.internal_fa = 0;
-
-		return zipfi;
-	}
-
-	static Vector<String> get_abis() {
-		Vector<String> abis;
-		abis.push_back("armeabi-v7a");
-		abis.push_back("arm64-v8a");
-		abis.push_back("x86");
-		abis.push_back("x86_64");
-		return abis;
-	}
-
-	/// List the gdap files in the directory specified by the p_path parameter.
-	static Vector<String> list_gdap_files(const String &p_path) {
-		Vector<String> dir_files;
-		DirAccessRef da = DirAccess::open(p_path);
-		if (da) {
-			da->list_dir_begin();
-			while (true) {
-				String file = da->get_next();
-				if (file == "") {
-					break;
-				}
-
-				if (da->current_is_dir() || da->current_is_hidden()) {
-					continue;
-				}
-
-				if (file.ends_with(PluginConfigAndroid::PLUGIN_CONFIG_EXT)) {
-					dir_files.push_back(file);
-				}
-			}
-			da->list_dir_end();
-		}
-
-		return dir_files;
-	}
-
-	static Vector<PluginConfigAndroid> get_plugins() {
-		Vector<PluginConfigAndroid> loaded_plugins;
-
-		String plugins_dir = ProjectSettings::get_singleton()->get_resource_path().plus_file("android/plugins");
-
-		// Add the prebuilt plugins
-		loaded_plugins.append_array(get_prebuilt_plugins(plugins_dir));
-
-		if (DirAccess::exists(plugins_dir)) {
-			Vector<String> plugins_filenames = list_gdap_files(plugins_dir);
-
-			if (!plugins_filenames.is_empty()) {
-				Ref<ConfigFile> config_file = memnew(ConfigFile);
-				for (int i = 0; i < plugins_filenames.size(); i++) {
-					PluginConfigAndroid config = load_plugin_config(config_file, plugins_dir.plus_file(plugins_filenames[i]));
-					if (config.valid_config) {
-						loaded_plugins.push_back(config);
-					} else {
-						print_error("Invalid plugin config file " + plugins_filenames[i]);
-					}
-				}
-			}
-		}
-
-		return loaded_plugins;
-	}
-
-	static Vector<PluginConfigAndroid> get_enabled_plugins(const Ref<EditorExportPreset> &p_presets) {
-		Vector<PluginConfigAndroid> enabled_plugins;
-		Vector<PluginConfigAndroid> all_plugins = get_plugins();
-		for (int i = 0; i < all_plugins.size(); i++) {
-			PluginConfigAndroid plugin = all_plugins[i];
-			bool enabled = p_presets->get("plugins/" + plugin.name);
-			if (enabled) {
-				enabled_plugins.push_back(plugin);
-			}
-		}
-
-		return enabled_plugins;
-	}
-
-	static Error store_in_apk(APKExportData *ed, const String &p_path, const Vector<uint8_t> &p_data, int compression_method = Z_DEFLATED) {
-		zip_fileinfo zipfi = get_zip_fileinfo();
-		zipOpenNewFileInZip(ed->apk,
-				p_path.utf8().get_data(),
-				&zipfi,
-				nullptr,
-				0,
-				nullptr,
-				0,
-				nullptr,
-				compression_method,
-				Z_DEFAULT_COMPRESSION);
-
-		zipWriteInFileInZip(ed->apk, p_data.ptr(), p_data.size());
-		zipCloseFileInZip(ed->apk);
-
-		return OK;
-	}
-
-	static Error save_apk_so(void *p_userdata, const SharedObject &p_so) {
-		if (!p_so.path.get_file().begins_with("lib")) {
-			String err = "Android .so file names must start with \"lib\", but got: " + p_so.path;
-			ERR_PRINT(err);
-			return FAILED;
-		}
-		APKExportData *ed = (APKExportData *)p_userdata;
-		Vector<String> abis = get_abis();
-		bool exported = false;
-		for (int i = 0; i < p_so.tags.size(); ++i) {
-			// shared objects can be fat (compatible with multiple ABIs)
-			int abi_index = abis.find(p_so.tags[i]);
-			if (abi_index != -1) {
-				exported = true;
-				String abi = abis[abi_index];
-				String dst_path = String("lib").plus_file(abi).plus_file(p_so.path.get_file());
-				Vector<uint8_t> array = FileAccess::get_file_as_array(p_so.path);
-				Error store_err = store_in_apk(ed, dst_path, array);
-				ERR_FAIL_COND_V_MSG(store_err, store_err, "Cannot store in apk file '" + dst_path + "'.");
-			}
-		}
-		if (!exported) {
-			String abis_string = String(" ").join(abis);
-			String err = "Cannot determine ABI for library \"" + p_so.path + "\". One of the supported ABIs must be used as a tag: " + abis_string;
-			ERR_PRINT(err);
-			return FAILED;
-		}
-		return OK;
-	}
-
-	static Error 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) {
-		APKExportData *ed = (APKExportData *)p_userdata;
-		String dst_path = p_path.replace_first("res://", "assets/");
-
-		store_in_apk(ed, dst_path, p_data, _should_compress_asset(p_path, p_data) ? Z_DEFLATED : 0);
-		return OK;
-	}
-
-	static Error ignore_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) {
-		return OK;
-	}
-
-	static Error copy_gradle_so(void *p_userdata, const SharedObject &p_so) {
-		ERR_FAIL_COND_V_MSG(!p_so.path.get_file().begins_with("lib"), FAILED,
-				"Android .so file names must start with \"lib\", but got: " + p_so.path);
-		Vector<String> abis = get_abis();
-		CustomExportData *export_data = (CustomExportData *)p_userdata;
-		bool exported = false;
-		for (int i = 0; i < p_so.tags.size(); ++i) {
-			int abi_index = abis.find(p_so.tags[i]);
-			if (abi_index != -1) {
-				exported = true;
-				String base = "res://android/build/libs";
-				String type = export_data->debug ? "debug" : "release";
-				String abi = abis[abi_index];
-				String filename = p_so.path.get_file();
-				String dst_path = base.plus_file(type).plus_file(abi).plus_file(filename);
-				Vector<uint8_t> data = FileAccess::get_file_as_array(p_so.path);
-				print_verbose("Copying .so file from " + p_so.path + " to " + dst_path);
-				Error err = store_file_at_path(dst_path, data);
-				ERR_FAIL_COND_V_MSG(err, err, "Failed to copy .so file from " + p_so.path + " to " + dst_path);
-				export_data->libs.push_back(dst_path);
-			}
-		}
-		ERR_FAIL_COND_V_MSG(!exported, FAILED,
-				"Cannot determine ABI for library \"" + p_so.path + "\". One of the supported ABIs must be used as a tag: " + String(" ").join(abis));
-		return OK;
-	}
-
-	void _get_permissions(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions) {
-		const char **aperms = android_perms;
-		while (*aperms) {
-			bool enabled = p_preset->get("permissions/" + String(*aperms).to_lower());
-			if (enabled) {
-				r_permissions.push_back("android.permission." + String(*aperms));
-			}
-			aperms++;
-		}
-		PackedStringArray user_perms = p_preset->get("permissions/custom_permissions");
-		for (int i = 0; i < user_perms.size(); i++) {
-			String user_perm = user_perms[i].strip_edges();
-			if (!user_perm.is_empty()) {
-				r_permissions.push_back(user_perm);
-			}
-		}
-		if (p_give_internet) {
-			if (r_permissions.find("android.permission.INTERNET") == -1) {
-				r_permissions.push_back("android.permission.INTERNET");
-			}
-		}
-
-		int xr_mode_index = p_preset->get("xr_features/xr_mode");
-		if (xr_mode_index == 1 /* XRMode.OVR */) {
-			int hand_tracking_index = p_preset->get("xr_features/hand_tracking"); // 0: none, 1: optional, 2: required
-			if (hand_tracking_index > 0) {
-				if (r_permissions.find("com.oculus.permission.HAND_TRACKING") == -1) {
-					r_permissions.push_back("com.oculus.permission.HAND_TRACKING");
-				}
-			}
-		}
-	}
-
-	void _write_tmp_manifest(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, bool p_debug) {
-		print_verbose("Building temporary manifest..");
-		String manifest_text =
-				"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-				"<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n"
-				"    xmlns:tools=\"http://schemas.android.com/tools\">\n";
-
-		manifest_text += _get_screen_sizes_tag(p_preset);
-		manifest_text += _get_gles_tag();
-
-		Vector<String> perms;
-		_get_permissions(p_preset, p_give_internet, perms);
-		for (int i = 0; i < perms.size(); i++) {
-			manifest_text += vformat("    <uses-permission android:name=\"%s\" />\n", perms.get(i));
-		}
-
-		manifest_text += _get_xr_features_tag(p_preset);
-		manifest_text += _get_instrumentation_tag(p_preset);
-		manifest_text += _get_application_tag(p_preset);
-		manifest_text += "</manifest>\n";
-		String manifest_path = vformat("res://android/build/src/%s/AndroidManifest.xml", (p_debug ? "debug" : "release"));
-
-		print_verbose("Storing manifest into " + manifest_path + ": " + "\n" + manifest_text);
-		store_string_at_path(manifest_path, manifest_text);
-	}
-
-	void _fix_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_manifest, bool p_give_internet) {
-		// Leaving the unused types commented because looking these constants up
-		// again later would be annoying
-		// const int CHUNK_AXML_FILE = 0x00080003;
-		// const int CHUNK_RESOURCEIDS = 0x00080180;
-		const int CHUNK_STRINGS = 0x001C0001;
-		// const int CHUNK_XML_END_NAMESPACE = 0x00100101;
-		const int CHUNK_XML_END_TAG = 0x00100103;
-		// const int CHUNK_XML_START_NAMESPACE = 0x00100100;
-		const int CHUNK_XML_START_TAG = 0x00100102;
-		// const int CHUNK_XML_TEXT = 0x00100104;
-		const int UTF8_FLAG = 0x00000100;
-
-		Vector<String> string_table;
-
-		uint32_t ofs = 8;
-
-		uint32_t string_count = 0;
-		//uint32_t styles_count = 0;
-		uint32_t string_flags = 0;
-		uint32_t string_data_offset = 0;
-
-		//uint32_t styles_offset = 0;
-		uint32_t string_table_begins = 0;
-		uint32_t string_table_ends = 0;
-		Vector<uint8_t> stable_extra;
-
-		String version_name = p_preset->get("version/name");
-		int version_code = p_preset->get("version/code");
-		String package_name = p_preset->get("package/unique_name");
-
-		const int screen_orientation =
-				_get_android_orientation_value(DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation"))));
-
-		bool screen_support_small = p_preset->get("screen/support_small");
-		bool screen_support_normal = p_preset->get("screen/support_normal");
-		bool screen_support_large = p_preset->get("screen/support_large");
-		bool screen_support_xlarge = p_preset->get("screen/support_xlarge");
-
-		int xr_mode_index = p_preset->get("xr_features/xr_mode");
-
-		bool backup_allowed = p_preset->get("user_data_backup/allow");
-		bool classify_as_game = p_preset->get("package/classify_as_game");
-
-		Vector<String> perms;
-		// Write permissions into the perms variable.
-		_get_permissions(p_preset, p_give_internet, perms);
-
-		while (ofs < (uint32_t)p_manifest.size()) {
-			uint32_t chunk = decode_uint32(&p_manifest[ofs]);
-			uint32_t size = decode_uint32(&p_manifest[ofs + 4]);
-
-			switch (chunk) {
-				case CHUNK_STRINGS: {
-					int iofs = ofs + 8;
-
-					string_count = decode_uint32(&p_manifest[iofs]);
-					//styles_count = decode_uint32(&p_manifest[iofs + 4]);
-					string_flags = decode_uint32(&p_manifest[iofs + 8]);
-					string_data_offset = decode_uint32(&p_manifest[iofs + 12]);
-					//styles_offset = decode_uint32(&p_manifest[iofs + 16]);
-					/*
-					printf("string count: %i\n",string_count);
-					printf("flags: %i\n",string_flags);
-					printf("sdata ofs: %i\n",string_data_offset);
-					printf("styles ofs: %i\n",styles_offset);
-					*/
-					uint32_t st_offset = iofs + 20;
-					string_table.resize(string_count);
-					uint32_t string_end = 0;
-
-					string_table_begins = st_offset;
-
-					for (uint32_t i = 0; i < string_count; i++) {
-						uint32_t string_at = decode_uint32(&p_manifest[st_offset + i * 4]);
-						string_at += st_offset + string_count * 4;
-
-						ERR_FAIL_COND_MSG(string_flags & UTF8_FLAG, "Unimplemented, can't read UTF-8 string table.");
-
-						if (string_flags & UTF8_FLAG) {
-						} else {
-							uint32_t len = decode_uint16(&p_manifest[string_at]);
-							Vector<char32_t> ucstring;
-							ucstring.resize(len + 1);
-							for (uint32_t j = 0; j < len; j++) {
-								uint16_t c = decode_uint16(&p_manifest[string_at + 2 + 2 * j]);
-								ucstring.write[j] = c;
-							}
-							string_end = MAX(string_at + 2 + 2 * len, string_end);
-							ucstring.write[len] = 0;
-							string_table.write[i] = ucstring.ptr();
-						}
-					}
-
-					for (uint32_t i = string_end; i < (ofs + size); i++) {
-						stable_extra.push_back(p_manifest[i]);
-					}
-
-					string_table_ends = ofs + size;
-
-				} break;
-				case CHUNK_XML_START_TAG: {
-					int iofs = ofs + 8;
-					uint32_t name = decode_uint32(&p_manifest[iofs + 12]);
-
-					String tname = string_table[name];
-					uint32_t attrcount = decode_uint32(&p_manifest[iofs + 20]);
-					iofs += 28;
-
-					for (uint32_t i = 0; i < attrcount; i++) {
-						uint32_t attr_nspace = decode_uint32(&p_manifest[iofs]);
-						uint32_t attr_name = decode_uint32(&p_manifest[iofs + 4]);
-						uint32_t attr_value = decode_uint32(&p_manifest[iofs + 8]);
-						uint32_t attr_resid = decode_uint32(&p_manifest[iofs + 16]);
-
-						const String value = (attr_value != 0xFFFFFFFF) ? string_table[attr_value] : "Res #" + itos(attr_resid);
-						String attrname = string_table[attr_name];
-						const String nspace = (attr_nspace != 0xFFFFFFFF) ? string_table[attr_nspace] : "";
-
-						//replace project information
-						if (tname == "manifest" && attrname == "package") {
-							string_table.write[attr_value] = get_package_name(package_name);
-						}
-
-						if (tname == "manifest" && attrname == "versionCode") {
-							encode_uint32(version_code, &p_manifest.write[iofs + 16]);
-						}
-
-						if (tname == "manifest" && attrname == "versionName") {
-							if (attr_value == 0xFFFFFFFF) {
-								WARN_PRINT("Version name in a resource, should be plain text");
-							} else {
-								string_table.write[attr_value] = version_name;
-							}
-						}
-
-						if (tname == "application" && attrname == "allowBackup") {
-							encode_uint32(backup_allowed, &p_manifest.write[iofs + 16]);
-						}
-
-						if (tname == "application" && attrname == "isGame") {
-							encode_uint32(classify_as_game, &p_manifest.write[iofs + 16]);
-						}
-
-						if (tname == "instrumentation" && attrname == "targetPackage") {
-							string_table.write[attr_value] = get_package_name(package_name);
-						}
-
-						if (tname == "activity" && attrname == "screenOrientation") {
-							encode_uint32(screen_orientation, &p_manifest.write[iofs + 16]);
-						}
-
-						if (tname == "supports-screens") {
-							if (attrname == "smallScreens") {
-								encode_uint32(screen_support_small ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
-
-							} else if (attrname == "normalScreens") {
-								encode_uint32(screen_support_normal ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
-
-							} else if (attrname == "largeScreens") {
-								encode_uint32(screen_support_large ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
-
-							} else if (attrname == "xlargeScreens") {
-								encode_uint32(screen_support_xlarge ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
-							}
-						}
-
-						iofs += 20;
-					}
-
-				} break;
-				case CHUNK_XML_END_TAG: {
-					int iofs = ofs + 8;
-					uint32_t name = decode_uint32(&p_manifest[iofs + 12]);
-					String tname = string_table[name];
-
-					if (tname == "uses-feature") {
-						Vector<String> feature_names;
-						Vector<bool> feature_required_list;
-						Vector<int> feature_versions;
-
-						if (xr_mode_index == 1 /* XRMode.OVR */) {
-							// Check for hand tracking
-							int hand_tracking_index = p_preset->get("xr_features/hand_tracking"); // 0: none, 1: optional, 2: required
-							if (hand_tracking_index > 0) {
-								feature_names.push_back("oculus.software.handtracking");
-								feature_required_list.push_back(hand_tracking_index == 2);
-								feature_versions.push_back(-1); // no version attribute should be added.
-							}
-						}
-
-						if (feature_names.size() > 0) {
-							ofs += 24; // skip over end tag
-
-							// save manifest ending so we can restore it
-							Vector<uint8_t> manifest_end;
-							uint32_t manifest_cur_size = p_manifest.size();
-
-							manifest_end.resize(p_manifest.size() - ofs);
-							memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
-
-							int32_t attr_name_string = string_table.find("name");
-							ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
-
-							int32_t ns_android_string = string_table.find("http://schemas.android.com/apk/res/android");
-							if (ns_android_string == -1) {
-								string_table.push_back("http://schemas.android.com/apk/res/android");
-								ns_android_string = string_table.size() - 1;
-							}
-
-							int32_t attr_uses_feature_string = string_table.find("uses-feature");
-							if (attr_uses_feature_string == -1) {
-								string_table.push_back("uses-feature");
-								attr_uses_feature_string = string_table.size() - 1;
-							}
-
-							int32_t attr_required_string = string_table.find("required");
-							if (attr_required_string == -1) {
-								string_table.push_back("required");
-								attr_required_string = string_table.size() - 1;
-							}
-
-							for (int i = 0; i < feature_names.size(); i++) {
-								String feature_name = feature_names[i];
-								bool feature_required = feature_required_list[i];
-								int feature_version = feature_versions[i];
-								bool has_version_attribute = feature_version != -1;
-
-								print_line("Adding feature " + feature_name);
-
-								int32_t feature_string = string_table.find(feature_name);
-								if (feature_string == -1) {
-									string_table.push_back(feature_name);
-									feature_string = string_table.size() - 1;
-								}
-
-								String required_value_string = feature_required ? "true" : "false";
-								int32_t required_value = string_table.find(required_value_string);
-								if (required_value == -1) {
-									string_table.push_back(required_value_string);
-									required_value = string_table.size() - 1;
-								}
-
-								int32_t attr_version_string = -1;
-								int32_t version_value = -1;
-								int tag_size;
-								int attr_count;
-								if (has_version_attribute) {
-									attr_version_string = string_table.find("version");
-									if (attr_version_string == -1) {
-										string_table.push_back("version");
-										attr_version_string = string_table.size() - 1;
-									}
-
-									version_value = string_table.find(itos(feature_version));
-									if (version_value == -1) {
-										string_table.push_back(itos(feature_version));
-										version_value = string_table.size() - 1;
-									}
-
-									tag_size = 96; // node and three attrs + end node
-									attr_count = 3;
-								} else {
-									tag_size = 76; // node and two attrs + end node
-									attr_count = 2;
-								}
-								manifest_cur_size += tag_size + 24;
-								p_manifest.resize(manifest_cur_size);
-
-								// start tag
-								encode_uint16(0x102, &p_manifest.write[ofs]); // type
-								encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
-								encode_uint32(tag_size, &p_manifest.write[ofs + 4]); // size
-								encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
-								encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
-								encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
-								encode_uint32(attr_uses_feature_string, &p_manifest.write[ofs + 20]); // name
-								encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
-								encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
-								encode_uint16(attr_count, &p_manifest.write[ofs + 28]); // num_attrs
-								encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
-								encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
-								encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
-
-								// android:name attribute
-								encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
-								encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
-								encode_uint32(feature_string, &p_manifest.write[ofs + 44]); // raw_value
-								encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
-								p_manifest.write[ofs + 50] = 0; // typedvalue_always0
-								p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
-								encode_uint32(feature_string, &p_manifest.write[ofs + 52]); // typedvalue reference
-
-								// android:required attribute
-								encode_uint32(ns_android_string, &p_manifest.write[ofs + 56]); // ns
-								encode_uint32(attr_required_string, &p_manifest.write[ofs + 60]); // 'name'
-								encode_uint32(required_value, &p_manifest.write[ofs + 64]); // raw_value
-								encode_uint16(8, &p_manifest.write[ofs + 68]); // typedvalue_size
-								p_manifest.write[ofs + 70] = 0; // typedvalue_always0
-								p_manifest.write[ofs + 71] = 0x03; // typedvalue_type (string)
-								encode_uint32(required_value, &p_manifest.write[ofs + 72]); // typedvalue reference
-
-								ofs += 76;
-
-								if (has_version_attribute) {
-									// android:version attribute
-									encode_uint32(ns_android_string, &p_manifest.write[ofs]); // ns
-									encode_uint32(attr_version_string, &p_manifest.write[ofs + 4]); // 'name'
-									encode_uint32(version_value, &p_manifest.write[ofs + 8]); // raw_value
-									encode_uint16(8, &p_manifest.write[ofs + 12]); // typedvalue_size
-									p_manifest.write[ofs + 14] = 0; // typedvalue_always0
-									p_manifest.write[ofs + 15] = 0x03; // typedvalue_type (string)
-									encode_uint32(version_value, &p_manifest.write[ofs + 16]); // typedvalue reference
-
-									ofs += 20;
-								}
-
-								// end tag
-								encode_uint16(0x103, &p_manifest.write[ofs]); // type
-								encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
-								encode_uint32(24, &p_manifest.write[ofs + 4]); // size
-								encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
-								encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
-								encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
-								encode_uint32(attr_uses_feature_string, &p_manifest.write[ofs + 20]); // name
-
-								ofs += 24;
-							}
-							memcpy(&p_manifest.write[ofs], manifest_end.ptr(), manifest_end.size());
-							ofs -= 24; // go back over back end
-						}
-					}
-					if (tname == "manifest") {
-						// save manifest ending so we can restore it
-						Vector<uint8_t> manifest_end;
-						uint32_t manifest_cur_size = p_manifest.size();
-
-						manifest_end.resize(p_manifest.size() - ofs);
-						memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
-
-						int32_t attr_name_string = string_table.find("name");
-						ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
-
-						int32_t ns_android_string = string_table.find("android");
-						ERR_FAIL_COND_MSG(ns_android_string == -1, "Template does not have 'android' namespace.");
-
-						int32_t attr_uses_permission_string = string_table.find("uses-permission");
-						if (attr_uses_permission_string == -1) {
-							string_table.push_back("uses-permission");
-							attr_uses_permission_string = string_table.size() - 1;
-						}
-
-						for (int i = 0; i < perms.size(); ++i) {
-							print_line("Adding permission " + perms[i]);
-
-							manifest_cur_size += 56 + 24; // node + end node
-							p_manifest.resize(manifest_cur_size);
-
-							// Add permission to the string pool
-							int32_t perm_string = string_table.find(perms[i]);
-							if (perm_string == -1) {
-								string_table.push_back(perms[i]);
-								perm_string = string_table.size() - 1;
-							}
-
-							// start tag
-							encode_uint16(0x102, &p_manifest.write[ofs]); // type
-							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
-							encode_uint32(56, &p_manifest.write[ofs + 4]); // size
-							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
-							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
-							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
-							encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
-							encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
-							encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
-							encode_uint16(1, &p_manifest.write[ofs + 28]); // num_attrs
-							encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
-							encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
-							encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
-
-							// attribute
-							encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
-							encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
-							encode_uint32(perm_string, &p_manifest.write[ofs + 44]); // raw_value
-							encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
-							p_manifest.write[ofs + 50] = 0; // typedvalue_always0
-							p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
-							encode_uint32(perm_string, &p_manifest.write[ofs + 52]); // typedvalue reference
-
-							ofs += 56;
-
-							// end tag
-							encode_uint16(0x103, &p_manifest.write[ofs]); // type
-							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
-							encode_uint32(24, &p_manifest.write[ofs + 4]); // size
-							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
-							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
-							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
-							encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
-
-							ofs += 24;
-						}
-
-						// copy footer back in
-						memcpy(&p_manifest.write[ofs], manifest_end.ptr(), manifest_end.size());
-					}
-				} break;
-			}
-
-			ofs += size;
-		}
-
-		//create new andriodmanifest binary
-
-		Vector<uint8_t> ret;
-		ret.resize(string_table_begins + string_table.size() * 4);
-
-		for (uint32_t i = 0; i < string_table_begins; i++) {
-			ret.write[i] = p_manifest[i];
-		}
-
-		ofs = 0;
-		for (int i = 0; i < string_table.size(); i++) {
-			encode_uint32(ofs, &ret.write[string_table_begins + i * 4]);
-			ofs += string_table[i].length() * 2 + 2 + 2;
-		}
-
-		ret.resize(ret.size() + ofs);
-		string_data_offset = ret.size() - ofs;
-		uint8_t *chars = &ret.write[string_data_offset];
-		for (int i = 0; i < string_table.size(); i++) {
-			String s = string_table[i];
-			encode_uint16(s.length(), chars);
-			chars += 2;
-			for (int j = 0; j < s.length(); j++) {
-				encode_uint16(s[j], chars);
-				chars += 2;
-			}
-			encode_uint16(0, chars);
-			chars += 2;
-		}
-
-		for (int i = 0; i < stable_extra.size(); i++) {
-			ret.push_back(stable_extra[i]);
-		}
-
-		//pad
-		while (ret.size() % 4) {
-			ret.push_back(0);
-		}
-
-		uint32_t new_stable_end = ret.size();
-
-		uint32_t extra = (p_manifest.size() - string_table_ends);
-		ret.resize(new_stable_end + extra);
-		for (uint32_t i = 0; i < extra; i++) {
-			ret.write[new_stable_end + i] = p_manifest[string_table_ends + i];
-		}
-
-		while (ret.size() % 4) {
-			ret.push_back(0);
-		}
-		encode_uint32(ret.size(), &ret.write[4]); //update new file size
-
-		encode_uint32(new_stable_end - 8, &ret.write[12]); //update new string table size
-		encode_uint32(string_table.size(), &ret.write[16]); //update new number of strings
-		encode_uint32(string_data_offset - 8, &ret.write[28]); //update new string data offset
-
-		p_manifest = ret;
-	}
-
-	static String _parse_string(const uint8_t *p_bytes, bool p_utf8) {
-		uint32_t offset = 0;
-		uint32_t len = 0;
-
-		if (p_utf8) {
-			uint8_t byte = p_bytes[offset];
-			if (byte & 0x80) {
-				offset += 2;
-			} else {
-				offset += 1;
-			}
-			byte = p_bytes[offset];
-			offset++;
-			if (byte & 0x80) {
-				len = byte & 0x7F;
-				len = (len << 8) + p_bytes[offset];
-				offset++;
-			} else {
-				len = byte;
-			}
-		} else {
-			len = decode_uint16(&p_bytes[offset]);
-			offset += 2;
-			if (len & 0x8000) {
-				len &= 0x7FFF;
-				len = (len << 16) + decode_uint16(&p_bytes[offset]);
-				offset += 2;
-			}
-		}
-
-		if (p_utf8) {
-			Vector<uint8_t> str8;
-			str8.resize(len + 1);
-			for (uint32_t i = 0; i < len; i++) {
-				str8.write[i] = p_bytes[offset + i];
-			}
-			str8.write[len] = 0;
-			String str;
-			str.parse_utf8((const char *)str8.ptr());
-			return str;
-		} else {
-			String str;
-			for (uint32_t i = 0; i < len; i++) {
-				char32_t c = decode_uint16(&p_bytes[offset + i * 2]);
-				if (c == 0) {
-					break;
-				}
-				str += String::chr(c);
-			}
-			return str;
-		}
-	}
-
-	void _fix_resources(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &r_manifest) {
-		const int UTF8_FLAG = 0x00000100;
-
-		uint32_t string_block_len = decode_uint32(&r_manifest[16]);
-		uint32_t string_count = decode_uint32(&r_manifest[20]);
-		uint32_t string_flags = decode_uint32(&r_manifest[28]);
-		const uint32_t string_table_begins = 40;
-
-		Vector<String> string_table;
-
-		String package_name = p_preset->get("package/name");
-
-		for (uint32_t i = 0; i < string_count; i++) {
-			uint32_t offset = decode_uint32(&r_manifest[string_table_begins + i * 4]);
-			offset += string_table_begins + string_count * 4;
-
-			String str = _parse_string(&r_manifest[offset], string_flags & UTF8_FLAG);
-
-			if (str.begins_with("godot-project-name")) {
-				if (str == "godot-project-name") {
-					//project name
-					str = get_project_name(package_name);
-
-				} else {
-					String lang = str.substr(str.rfind("-") + 1, str.length()).replace("-", "_");
-					String prop = "application/config/name_" + lang;
-					if (ProjectSettings::get_singleton()->has_setting(prop)) {
-						str = ProjectSettings::get_singleton()->get(prop);
-					} else {
-						str = get_project_name(package_name);
-					}
-				}
-			}
-
-			string_table.push_back(str);
-		}
-
-		//write a new string table, but use 16 bits
-		Vector<uint8_t> ret;
-		ret.resize(string_table_begins + string_table.size() * 4);
-
-		for (uint32_t i = 0; i < string_table_begins; i++) {
-			ret.write[i] = r_manifest[i];
-		}
-
-		int ofs = 0;
-		for (int i = 0; i < string_table.size(); i++) {
-			encode_uint32(ofs, &ret.write[string_table_begins + i * 4]);
-			ofs += string_table[i].length() * 2 + 2 + 2;
-		}
-
-		ret.resize(ret.size() + ofs);
-		uint8_t *chars = &ret.write[ret.size() - ofs];
-		for (int i = 0; i < string_table.size(); i++) {
-			String s = string_table[i];
-			encode_uint16(s.length(), chars);
-			chars += 2;
-			for (int j = 0; j < s.length(); j++) {
-				encode_uint16(s[j], chars);
-				chars += 2;
-			}
-			encode_uint16(0, chars);
-			chars += 2;
-		}
-
-		//pad
-		while (ret.size() % 4) {
-			ret.push_back(0);
-		}
-
-		//change flags to not use utf8
-		encode_uint32(string_flags & ~0x100, &ret.write[28]);
-		//change length
-		encode_uint32(ret.size() - 12, &ret.write[16]);
-		//append the rest...
-		int rest_from = 12 + string_block_len;
-		int rest_to = ret.size();
-		int rest_len = (r_manifest.size() - rest_from);
-		ret.resize(ret.size() + (r_manifest.size() - rest_from));
-		for (int i = 0; i < rest_len; i++) {
-			ret.write[rest_to + i] = r_manifest[rest_from + i];
-		}
-		//finally update the size
-		encode_uint32(ret.size(), &ret.write[4]);
-
-		r_manifest = ret;
-		//printf("end\n");
-	}
-
-	void _load_image_data(const Ref<Image> &p_splash_image, Vector<uint8_t> &p_data) {
-		Vector<uint8_t> png_buffer;
-		Error err = PNGDriverCommon::image_to_png(p_splash_image, png_buffer);
-		if (err == OK) {
-			p_data.resize(png_buffer.size());
-			memcpy(p_data.ptrw(), png_buffer.ptr(), p_data.size());
-		} else {
-			String err_str = String("Failed to convert splash image to png.");
-			WARN_PRINT(err_str.utf8().get_data());
-		}
-	}
-
-	void _process_launcher_icons(const String &p_file_name, const Ref<Image> &p_source_image, int dimension, Vector<uint8_t> &p_data) {
-		Ref<Image> working_image = p_source_image;
-
-		if (p_source_image->get_width() != dimension || p_source_image->get_height() != dimension) {
-			working_image = p_source_image->duplicate();
-			working_image->resize(dimension, dimension, Image::Interpolation::INTERPOLATE_LANCZOS);
-		}
-
-		Vector<uint8_t> png_buffer;
-		Error err = PNGDriverCommon::image_to_png(working_image, png_buffer);
-		if (err == OK) {
-			p_data.resize(png_buffer.size());
-			memcpy(p_data.ptrw(), png_buffer.ptr(), p_data.size());
-		} else {
-			String err_str = String("Failed to convert resized icon (") + p_file_name + ") to png.";
-			WARN_PRINT(err_str.utf8().get_data());
-		}
-	}
-
-	String load_splash_refs(Ref<Image> &splash_image, Ref<Image> &splash_bg_color_image) {
-		bool scale_splash = ProjectSettings::get_singleton()->get("application/boot_splash/fullsize");
-		bool apply_filter = ProjectSettings::get_singleton()->get("application/boot_splash/use_filter");
-		String project_splash_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
-
-		if (!project_splash_path.is_empty()) {
-			splash_image.instantiate();
-			print_verbose("Loading splash image: " + project_splash_path);
-			const Error err = ImageLoader::load_image(project_splash_path, splash_image);
-			if (err) {
-				if (OS::get_singleton()->is_stdout_verbose()) {
-					print_error("- unable to load splash image from " + project_splash_path + " (" + itos(err) + ")");
-				}
-				splash_image.unref();
-			}
-		}
-
-		if (splash_image.is_null()) {
-			// Use the default
-			print_verbose("Using default splash image.");
-			splash_image = Ref<Image>(memnew(Image(boot_splash_png)));
-		}
-
-		if (scale_splash) {
-			Size2 screen_size = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));
-			int width, height;
-			if (screen_size.width > screen_size.height) {
-				// scale horizontally
-				height = screen_size.height;
-				width = splash_image->get_width() * screen_size.height / splash_image->get_height();
-			} else {
-				// scale vertically
-				width = screen_size.width;
-				height = splash_image->get_height() * screen_size.width / splash_image->get_width();
-			}
-			splash_image->resize(width, height);
-		}
-
-		// Setup the splash bg color
-		bool bg_color_valid;
-		Color bg_color = ProjectSettings::get_singleton()->get("application/boot_splash/bg_color", &bg_color_valid);
-		if (!bg_color_valid) {
-			bg_color = boot_splash_bg_color;
-		}
-
-		print_verbose("Creating splash background color image.");
-		splash_bg_color_image.instantiate();
-		splash_bg_color_image->create(splash_image->get_width(), splash_image->get_height(), false, splash_image->get_format());
-		splash_bg_color_image->fill(bg_color);
-
-		String processed_splash_config_xml = vformat(SPLASH_CONFIG_XML_CONTENT, bool_to_string(apply_filter));
-		return processed_splash_config_xml;
-	}
-
-	void load_icon_refs(const Ref<EditorExportPreset> &p_preset, Ref<Image> &icon, Ref<Image> &foreground, Ref<Image> &background) {
-		String project_icon_path = ProjectSettings::get_singleton()->get("application/config/icon");
-
-		icon.instantiate();
-		foreground.instantiate();
-		background.instantiate();
-
-		// Regular icon: user selection -> project icon -> default.
-		String path = static_cast<String>(p_preset->get(launcher_icon_option)).strip_edges();
-		print_verbose("Loading regular icon from " + path);
-		if (path.is_empty() || ImageLoader::load_image(path, icon) != OK) {
-			print_verbose("- falling back to project icon: " + project_icon_path);
-			ImageLoader::load_image(project_icon_path, icon);
-		}
-
-		// Adaptive foreground: user selection -> regular icon (user selection -> project icon -> default).
-		path = static_cast<String>(p_preset->get(launcher_adaptive_icon_foreground_option)).strip_edges();
-		print_verbose("Loading adaptive foreground icon from " + path);
-		if (path.is_empty() || ImageLoader::load_image(path, foreground) != OK) {
-			print_verbose("- falling back to using the regular icon");
-			foreground = icon;
-		}
-
-		// Adaptive background: user selection -> default.
-		path = static_cast<String>(p_preset->get(launcher_adaptive_icon_background_option)).strip_edges();
-		if (!path.is_empty()) {
-			print_verbose("Loading adaptive background icon from " + path);
-			ImageLoader::load_image(path, background);
-		}
-	}
-
-	void store_image(const LauncherIcon launcher_icon, const Vector<uint8_t> &data) {
-		store_image(launcher_icon.export_path, data);
-	}
-
-	void store_image(const String &export_path, const Vector<uint8_t> &data) {
-		String img_path = export_path.insert(0, "res://android/build/");
-		store_file_at_path(img_path, data);
-	}
-
-	void _copy_icons_to_gradle_project(const Ref<EditorExportPreset> &p_preset,
-			const String &processed_splash_config_xml,
-			const Ref<Image> &splash_image,
-			const Ref<Image> &splash_bg_color_image,
-			const Ref<Image> &main_image,
-			const Ref<Image> &foreground,
-			const Ref<Image> &background) {
-		// Store the splash configuration
-		if (!processed_splash_config_xml.is_empty()) {
-			print_verbose("Storing processed splash configuration: " + String("\n") + processed_splash_config_xml);
-			store_string_at_path(SPLASH_CONFIG_PATH, processed_splash_config_xml);
-		}
-
-		// Store the splash image
-		if (splash_image.is_valid() && !splash_image->is_empty()) {
-			print_verbose("Storing splash image in " + String(SPLASH_IMAGE_EXPORT_PATH));
-			Vector<uint8_t> data;
-			_load_image_data(splash_image, data);
-			store_image(SPLASH_IMAGE_EXPORT_PATH, data);
-		}
-
-		// Store the splash bg color image
-		if (splash_bg_color_image.is_valid() && !splash_bg_color_image->is_empty()) {
-			print_verbose("Storing splash background image in " + String(SPLASH_BG_COLOR_PATH));
-			Vector<uint8_t> data;
-			_load_image_data(splash_bg_color_image, data);
-			store_image(SPLASH_BG_COLOR_PATH, data);
-		}
-
-		// Prepare images to be resized for the icons. If some image ends up being uninitialized,
-		// the default image from the export template will be used.
-
-		for (int i = 0; i < icon_densities_count; ++i) {
-			if (main_image.is_valid() && !main_image->is_empty()) {
-				print_verbose("Processing launcher icon for dimension " + itos(launcher_icons[i].dimensions) + " into " + launcher_icons[i].export_path);
-				Vector<uint8_t> data;
-				_process_launcher_icons(launcher_icons[i].export_path, main_image, launcher_icons[i].dimensions, data);
-				store_image(launcher_icons[i], data);
-			}
-
-			if (foreground.is_valid() && !foreground->is_empty()) {
-				print_verbose("Processing launcher adaptive icon foreground for dimension " + itos(launcher_adaptive_icon_foregrounds[i].dimensions) + " into " + launcher_adaptive_icon_foregrounds[i].export_path);
-				Vector<uint8_t> data;
-				_process_launcher_icons(launcher_adaptive_icon_foregrounds[i].export_path, foreground,
-						launcher_adaptive_icon_foregrounds[i].dimensions, data);
-				store_image(launcher_adaptive_icon_foregrounds[i], data);
-			}
-
-			if (background.is_valid() && !background->is_empty()) {
-				print_verbose("Processing launcher adaptive icon background for dimension " + itos(launcher_adaptive_icon_backgrounds[i].dimensions) + " into " + launcher_adaptive_icon_backgrounds[i].export_path);
-				Vector<uint8_t> data;
-				_process_launcher_icons(launcher_adaptive_icon_backgrounds[i].export_path, background,
-						launcher_adaptive_icon_backgrounds[i].dimensions, data);
-				store_image(launcher_adaptive_icon_backgrounds[i], data);
-			}
-		}
-	}
-
-	static Vector<String> get_enabled_abis(const Ref<EditorExportPreset> &p_preset) {
-		Vector<String> abis = get_abis();
-		Vector<String> enabled_abis;
-		for (int i = 0; i < abis.size(); ++i) {
-			bool is_enabled = p_preset->get("architectures/" + abis[i]);
-			if (is_enabled) {
-				enabled_abis.push_back(abis[i]);
-			}
-		}
-		return enabled_abis;
-	}
-
-public:
-	typedef Error (*EditorExportSaveFunction)(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);
-
-public:
-	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override {
-		String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
-		if (driver == "GLES2") {
-			r_features->push_back("etc");
-		}
-		// FIXME: Review what texture formats are used for Vulkan.
-		if (driver == "Vulkan") {
-			r_features->push_back("etc2");
-		}
-
-		Vector<String> abis = get_enabled_abis(p_preset);
-		for (int i = 0; i < abis.size(); ++i) {
-			r_features->push_back(abis[i]);
-		}
-	}
-
-	virtual void get_export_options(List<ExportOption> *r_options) override {
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.apk"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.apk"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "custom_template/use_custom_build"), false));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "custom_template/export_format", PROPERTY_HINT_ENUM, "Export APK,Export AAB"), EXPORT_FORMAT_APK));
-
-		Vector<PluginConfigAndroid> plugins_configs = get_plugins();
-		for (int i = 0; i < plugins_configs.size(); i++) {
-			print_verbose("Found Android plugin " + plugins_configs[i].name);
-			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "plugins/" + plugins_configs[i].name), false));
-		}
-		plugins_changed.clear();
-
-		Vector<String> abis = get_abis();
-		for (int i = 0; i < abis.size(); ++i) {
-			String abi = abis[i];
-			bool is_default = (abi == "armeabi-v7a" || abi == "arm64-v8a");
-			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + abi), is_default));
-		}
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/debug", PROPERTY_HINT_GLOBAL_FILE, "*.keystore,*.jks"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/debug_user"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/debug_password"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release", PROPERTY_HINT_GLOBAL_FILE, "*.keystore,*.jks"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release_user"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release_password"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "one_click_deploy/clear_previous_install"), false));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/code", PROPERTY_HINT_RANGE, "1,4096,1,or_greater"), 1));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "version/name"), "1.0"));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/unique_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "ext.domain.name"), "org.godotengine.$genname"));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name [default if blank]"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/classify_as_game"), true));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_icon_option, PROPERTY_HINT_FILE, "*.png"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_adaptive_icon_foreground_option, PROPERTY_HINT_FILE, "*.png"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_adaptive_icon_background_option, PROPERTY_HINT_FILE, "*.png"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "graphics/32_bits_framebuffer"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "graphics/opengl_debug"), false));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/xr_mode", PROPERTY_HINT_ENUM, "Regular,Oculus Mobile VR"), 0));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/hand_tracking", PROPERTY_HINT_ENUM, "None,Optional,Required"), 0));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/immersive_mode"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_small"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_xlarge"), true));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data_backup/allow"), false));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "command_line/extra_args"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "apk_expansion/enable"), false));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "apk_expansion/SALT"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "apk_expansion/public_key", PROPERTY_HINT_MULTILINE_TEXT), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "permissions/custom_permissions"), PackedStringArray()));
-
-		const char **perms = android_perms;
-		while (*perms) {
-			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "permissions/" + String(*perms).to_lower()), false));
-			perms++;
-		}
-	}
-
-	virtual String get_name() const override {
-		return "Android";
-	}
-
-	virtual String get_os_name() const override {
-		return "Android";
-	}
-
-	virtual Ref<Texture2D> get_logo() const override {
-		return logo;
-	}
-
-	virtual bool should_update_export_options() override {
-		bool export_options_changed = plugins_changed.is_set();
-		if (export_options_changed) {
-			// don't clear unless we're reporting true, to avoid race
-			plugins_changed.clear();
-		}
-		return export_options_changed;
-	}
-
-	virtual bool poll_export() override {
-		bool dc = devices_changed.is_set();
-		if (dc) {
-			// don't clear unless we're reporting true, to avoid race
-			devices_changed.clear();
-		}
-		return dc;
-	}
-
-	virtual int get_options_count() const override {
-		MutexLock lock(device_lock);
-		return devices.size();
-	}
-
-	virtual String get_options_tooltip() const override {
-		return TTR("Select device from the list");
-	}
-
-	virtual String get_option_label(int p_index) const override {
-		ERR_FAIL_INDEX_V(p_index, devices.size(), "");
-		MutexLock lock(device_lock);
-		return devices[p_index].name;
-	}
-
-	virtual String get_option_tooltip(int p_index) const override {
-		ERR_FAIL_INDEX_V(p_index, devices.size(), "");
-		MutexLock lock(device_lock);
-		String s = devices[p_index].description;
-		if (devices.size() == 1) {
-			// Tooltip will be:
-			// Name
-			// Description
-			s = devices[p_index].name + "\n\n" + s;
-		}
-		return s;
-	}
-
-	virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) override {
-		ERR_FAIL_INDEX_V(p_device, devices.size(), ERR_INVALID_PARAMETER);
-
-		String can_export_error;
-		bool can_export_missing_templates;
-		if (!can_export(p_preset, can_export_error, can_export_missing_templates)) {
-			EditorNode::add_io_error(can_export_error);
-			return ERR_UNCONFIGURED;
-		}
-
-		MutexLock lock(device_lock);
-
-		EditorProgress ep("run", vformat(TTR("Running on %s"), devices[p_device].name), 3);
-
-		String adb = get_adb_path();
-
-		// Export_temp APK.
-		if (ep.step(TTR("Exporting APK..."), 0)) {
-			return ERR_SKIP;
-		}
-
-		const bool use_remote = (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG) || (p_debug_flags & DEBUG_FLAG_DUMB_CLIENT);
-		const bool use_reverse = devices[p_device].api_level >= 21;
-
-		if (use_reverse) {
-			p_debug_flags |= DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST;
-		}
-
-		String tmp_export_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpexport." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
-
-#define CLEANUP_AND_RETURN(m_err)                         \
-	{                                                     \
-		DirAccess::remove_file_or_error(tmp_export_path); \
-		return m_err;                                     \
-	}
-
-		// Export to temporary APK before sending to device.
-		Error err = export_project_helper(p_preset, true, tmp_export_path, EXPORT_FORMAT_APK, true, p_debug_flags);
-
-		if (err != OK) {
-			CLEANUP_AND_RETURN(err);
-		}
-
-		List<String> args;
-		int rv;
-		String output;
-
-		bool remove_prev = p_preset->get("one_click_deploy/clear_previous_install");
-		String version_name = p_preset->get("version/name");
-		String package_name = p_preset->get("package/unique_name");
-
-		if (remove_prev) {
-			if (ep.step(TTR("Uninstalling..."), 1)) {
-				CLEANUP_AND_RETURN(ERR_SKIP);
-			}
-
-			print_line("Uninstalling previous version: " + devices[p_device].name);
-
-			args.push_back("-s");
-			args.push_back(devices[p_device].id);
-			args.push_back("uninstall");
-			args.push_back(get_package_name(package_name));
-
-			output.clear();
-			err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
-			print_verbose(output);
-		}
-
-		print_line("Installing to device (please wait...): " + devices[p_device].name);
-		if (ep.step(TTR("Installing to device, please wait..."), 2)) {
-			CLEANUP_AND_RETURN(ERR_SKIP);
-		}
-
-		args.clear();
-		args.push_back("-s");
-		args.push_back(devices[p_device].id);
-		args.push_back("install");
-		args.push_back("-r");
-		args.push_back(tmp_export_path);
-
-		output.clear();
-		err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
-		print_verbose(output);
-		if (err || rv != 0) {
-			EditorNode::add_io_error(vformat(TTR("Could not install to device: %s"), output));
-			CLEANUP_AND_RETURN(ERR_CANT_CREATE);
-		}
-
-		if (use_remote) {
-			if (use_reverse) {
-				static const char *const msg = "--- Device API >= 21; debugging over USB ---";
-				EditorNode::get_singleton()->get_log()->add_message(msg, EditorLog::MSG_TYPE_EDITOR);
-				print_line(String(msg).to_upper());
-
-				args.clear();
-				args.push_back("-s");
-				args.push_back(devices[p_device].id);
-				args.push_back("reverse");
-				args.push_back("--remove-all");
-				output.clear();
-				OS::get_singleton()->execute(adb, args, &output, &rv, true);
-				print_verbose(output);
-
-				if (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG) {
-					int dbg_port = EditorSettings::get_singleton()->get("network/debug/remote_port");
-					args.clear();
-					args.push_back("-s");
-					args.push_back(devices[p_device].id);
-					args.push_back("reverse");
-					args.push_back("tcp:" + itos(dbg_port));
-					args.push_back("tcp:" + itos(dbg_port));
-
-					output.clear();
-					OS::get_singleton()->execute(adb, args, &output, &rv, true);
-					print_verbose(output);
-					print_line("Reverse result: " + itos(rv));
-				}
-
-				if (p_debug_flags & DEBUG_FLAG_DUMB_CLIENT) {
-					int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port");
-
-					args.clear();
-					args.push_back("-s");
-					args.push_back(devices[p_device].id);
-					args.push_back("reverse");
-					args.push_back("tcp:" + itos(fs_port));
-					args.push_back("tcp:" + itos(fs_port));
-
-					output.clear();
-					err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
-					print_verbose(output);
-					print_line("Reverse result2: " + itos(rv));
-				}
-			} else {
-				static const char *const msg = "--- Device API < 21; debugging over Wi-Fi ---";
-				EditorNode::get_singleton()->get_log()->add_message(msg, EditorLog::MSG_TYPE_EDITOR);
-				print_line(String(msg).to_upper());
-			}
-		}
-
-		if (ep.step(TTR("Running on device..."), 3)) {
-			CLEANUP_AND_RETURN(ERR_SKIP);
-		}
-		args.clear();
-		args.push_back("-s");
-		args.push_back(devices[p_device].id);
-		args.push_back("shell");
-		args.push_back("am");
-		args.push_back("start");
-		if ((bool)EditorSettings::get_singleton()->get("export/android/force_system_user") && devices[p_device].api_level >= 17) { // Multi-user introduced in Android 17
-			args.push_back("--user");
-			args.push_back("0");
-		}
-		args.push_back("-a");
-		args.push_back("android.intent.action.MAIN");
-		args.push_back("-n");
-		args.push_back(get_package_name(package_name) + "/com.godot.game.GodotApp");
-
-		output.clear();
-		err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
-		print_verbose(output);
-		if (err || rv != 0) {
-			EditorNode::add_io_error(TTR("Could not execute on device."));
-			CLEANUP_AND_RETURN(ERR_CANT_CREATE);
-		}
-
-		CLEANUP_AND_RETURN(OK);
-#undef CLEANUP_AND_RETURN
-	}
-
-	virtual Ref<Texture2D> get_run_icon() const override {
-		return run_icon;
-	}
-
-	static String get_adb_path() {
-		String exe_ext = "";
-		if (OS::get_singleton()->get_name() == "Windows") {
-			exe_ext = ".exe";
-		}
-		String sdk_path = EditorSettings::get_singleton()->get("export/android/android_sdk_path");
-		return sdk_path.plus_file("platform-tools/adb" + exe_ext);
-	}
-
-	static String get_apksigner_path() {
-		String exe_ext = "";
-		if (OS::get_singleton()->get_name() == "Windows") {
-			exe_ext = ".bat";
-		}
-		String apksigner_command_name = "apksigner" + exe_ext;
-		String sdk_path = EditorSettings::get_singleton()->get("export/android/android_sdk_path");
-		String apksigner_path = "";
-
-		Error errn;
-		String build_tools_dir = sdk_path.plus_file("build-tools");
-		DirAccessRef da = DirAccess::open(build_tools_dir, &errn);
-		if (errn != OK) {
-			print_error("Unable to open Android 'build-tools' directory.");
-			return apksigner_path;
-		}
-
-		// There are additional versions directories we need to go through.
-		da->list_dir_begin();
-		String sub_dir = da->get_next();
-		while (!sub_dir.is_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(apksigner_command_name);
-				if (FileAccess::exists(tool_path)) {
-					apksigner_path = tool_path;
-					break;
-				}
-			}
-			sub_dir = da->get_next();
-		}
-		da->list_dir_end();
-
-		if (apksigner_path.is_empty()) {
-			EditorNode::get_singleton()->show_warning(TTR("Unable to find the 'apksigner' tool."));
-		}
-
-		return apksigner_path;
-	}
-
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override {
-		String err;
-		bool valid = false;
-
-		// Look for export templates (first official, and if defined custom templates).
-
-		if (!bool(p_preset->get("custom_template/use_custom_build"))) {
-			String template_err;
-			bool dvalid = false;
-			bool rvalid = false;
-			bool has_export_templates = false;
-
-			if (p_preset->get("custom_template/debug") != "") {
-				dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
-				if (!dvalid) {
-					template_err += TTR("Custom debug template not found.") + "\n";
-				}
-			} else {
-				has_export_templates |= exists_export_template("android_debug.apk", &template_err);
-			}
-
-			if (p_preset->get("custom_template/release") != "") {
-				rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
-				if (!rvalid) {
-					template_err += TTR("Custom release template not found.") + "\n";
-				}
-			} else {
-				has_export_templates |= exists_export_template("android_release.apk", &template_err);
-			}
-
-			r_missing_templates = !has_export_templates;
-			valid = dvalid || rvalid || has_export_templates;
-			if (!valid) {
-				err += template_err;
-			}
-		} else {
-			bool installed_android_build_template = FileAccess::exists("res://android/build/build.gradle");
-			if (!installed_android_build_template) {
-				r_missing_templates = !exists_export_template("android_source.zip", &err);
-				err += TTR("Android build template not installed in the project. Install it from the Project menu.") + "\n";
-			} else {
-				r_missing_templates = false;
-			}
-
-			valid = installed_android_build_template && !r_missing_templates;
-		}
-
-		// Validate the rest of the configuration.
-
-		String dk = p_preset->get("keystore/debug");
-		String dk_user = p_preset->get("keystore/debug_user");
-		String dk_password = p_preset->get("keystore/debug_password");
-
-		if ((dk.is_empty() || dk_user.is_empty() || dk_password.is_empty()) && (!dk.is_empty() || !dk_user.is_empty() || !dk_password.is_empty())) {
-			valid = false;
-			err += TTR("Either Debug Keystore, Debug User AND Debug Password settings must be configured OR none of them.") + "\n";
-		}
-
-		if (!FileAccess::exists(dk)) {
-			dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
-			if (!FileAccess::exists(dk)) {
-				valid = false;
-				err += TTR("Debug keystore not configured in the Editor Settings nor in the preset.") + "\n";
-			}
-		}
-
-		String rk = p_preset->get("keystore/release");
-		String rk_user = p_preset->get("keystore/release_user");
-		String rk_password = p_preset->get("keystore/release_password");
-
-		if ((rk.is_empty() || rk_user.is_empty() || rk_password.is_empty()) && (!rk.is_empty() || !rk_user.is_empty() || !rk_password.is_empty())) {
-			valid = false;
-			err += TTR("Either Release Keystore, Release User AND Release Password settings must be configured OR none of them.") + "\n";
-		}
-
-		if (!rk.is_empty() && !FileAccess::exists(rk)) {
-			valid = false;
-			err += TTR("Release keystore incorrectly configured in the export preset.") + "\n";
-		}
-
-		String sdk_path = EditorSettings::get_singleton()->get("export/android/android_sdk_path");
-		if (sdk_path == "") {
-			err += TTR("A valid Android SDK path is required in Editor Settings.") + "\n";
-			valid = false;
-		} else {
-			Error errn;
-			// Check for the platform-tools directory.
-			DirAccessRef da = DirAccess::open(sdk_path.plus_file("platform-tools"), &errn);
-			if (errn != OK) {
-				err += TTR("Invalid Android SDK path in Editor Settings.");
-				err += TTR("Missing 'platform-tools' directory!");
-				err += "\n";
-				valid = false;
-			}
-
-			// Validate that adb is available
-			String adb_path = get_adb_path();
-			if (!FileAccess::exists(adb_path)) {
-				err += TTR("Unable to find Android SDK platform-tools' adb command.");
-				err += TTR("Please check in the Android SDK directory specified in Editor Settings.");
-				err += "\n";
-				valid = false;
-			}
-
-			// Check for the build-tools directory.
-			DirAccessRef build_tools_da = DirAccess::open(sdk_path.plus_file("build-tools"), &errn);
-			if (errn != OK) {
-				err += TTR("Invalid Android SDK path in Editor Settings.");
-				err += TTR("Missing 'build-tools' directory!");
-				err += "\n";
-				valid = false;
-			}
-
-			// Validate that apksigner is available
-			String apksigner_path = get_apksigner_path();
-			if (!FileAccess::exists(apksigner_path)) {
-				err += TTR("Unable to find Android SDK build-tools' apksigner command.");
-				err += TTR("Please check in the Android SDK directory specified in Editor Settings.");
-				err += "\n";
-				valid = false;
-			}
-		}
-
-		bool apk_expansion = p_preset->get("apk_expansion/enable");
-
-		if (apk_expansion) {
-			String apk_expansion_pkey = p_preset->get("apk_expansion/public_key");
-
-			if (apk_expansion_pkey == "") {
-				valid = false;
-
-				err += TTR("Invalid public key for APK expansion.") + "\n";
-			}
-		}
-
-		String pn = p_preset->get("package/unique_name");
-		String pn_err;
-
-		if (!is_package_name_valid(get_package_name(pn), &pn_err)) {
-			valid = false;
-			err += TTR("Invalid package name:") + " " + pn_err + "\n";
-		}
-
-		String etc_error = test_etc2();
-		if (etc_error != String()) {
-			valid = false;
-			err += etc_error;
-		}
-
-		// Ensure that `Use Custom Build` is enabled if a plugin is selected.
-		String enabled_plugins_names = get_plugins_names(get_enabled_plugins(p_preset));
-		bool custom_build_enabled = p_preset->get("custom_template/use_custom_build");
-		if (!enabled_plugins_names.is_empty() && !custom_build_enabled) {
-			valid = false;
-			err += TTR("\"Use Custom Build\" must be enabled to use the plugins.");
-			err += "\n";
-		}
-
-		// Validate the Xr features are properly populated
-		int xr_mode_index = p_preset->get("xr_features/xr_mode");
-		int hand_tracking = p_preset->get("xr_features/hand_tracking");
-		if (xr_mode_index != /* XRMode.OVR*/ 1) {
-			if (hand_tracking > 0) {
-				valid = false;
-				err += TTR("\"Hand Tracking\" is only valid when \"Xr Mode\" is \"Oculus Mobile VR\".");
-				err += "\n";
-			}
-		}
-
-		if (int(p_preset->get("custom_template/export_format")) == EXPORT_FORMAT_AAB &&
-				!bool(p_preset->get("custom_template/use_custom_build"))) {
-			valid = false;
-			err += TTR("\"Export AAB\" is only valid when \"Use Custom Build\" is enabled.");
-			err += "\n";
-		}
-
-		r_error = err;
-		return valid;
-	}
-
-	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override {
-		List<String> list;
-		list.push_back("apk");
-		list.push_back("aab");
-		return list;
-	}
-
-	inline bool is_clean_build_required(Vector<PluginConfigAndroid> enabled_plugins) {
-		String plugin_names = get_plugins_names(enabled_plugins);
-		bool first_build = last_custom_build_time == 0;
-		bool have_plugins_changed = false;
-
-		if (!first_build) {
-			have_plugins_changed = plugin_names != last_plugin_names;
-			if (!have_plugins_changed) {
-				for (int i = 0; i < enabled_plugins.size(); i++) {
-					if (enabled_plugins.get(i).last_updated > last_custom_build_time) {
-						have_plugins_changed = true;
-						break;
-					}
-				}
-			}
-		}
-
-		last_custom_build_time = OS::get_singleton()->get_unix_time();
-		last_plugin_names = plugin_names;
-
-		return have_plugins_changed || first_build;
-	}
-
-	String get_apk_expansion_fullpath(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
-		int version_code = p_preset->get("version/code");
-		String package_name = p_preset->get("package/unique_name");
-		String apk_file_name = "main." + itos(version_code) + "." + get_package_name(package_name) + ".obb";
-		String fullpath = p_path.get_base_dir().plus_file(apk_file_name);
-		return fullpath;
-	}
-
-	Error save_apk_expansion_file(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
-		String fullpath = get_apk_expansion_fullpath(p_preset, p_path);
-		Error err = save_pack(p_preset, fullpath);
-		return err;
-	}
-
-	void get_command_line_flags(const Ref<EditorExportPreset> &p_preset, const String &p_path, int p_flags, Vector<uint8_t> &r_command_line_flags) {
-		String cmdline = p_preset->get("command_line/extra_args");
-		Vector<String> command_line_strings = cmdline.strip_edges().split(" ");
-		for (int i = 0; i < command_line_strings.size(); i++) {
-			if (command_line_strings[i].strip_edges().length() == 0) {
-				command_line_strings.remove(i);
-				i--;
-			}
-		}
-
-		gen_export_flags(command_line_strings, p_flags);
-
-		bool apk_expansion = p_preset->get("apk_expansion/enable");
-		if (apk_expansion) {
-			String fullpath = get_apk_expansion_fullpath(p_preset, p_path);
-			String apk_expansion_public_key = p_preset->get("apk_expansion/public_key");
-
-			command_line_strings.push_back("--use_apk_expansion");
-			command_line_strings.push_back("--apk_expansion_md5");
-			command_line_strings.push_back(FileAccess::get_md5(fullpath));
-			command_line_strings.push_back("--apk_expansion_key");
-			command_line_strings.push_back(apk_expansion_public_key.strip_edges());
-		}
-
-		int xr_mode_index = p_preset->get("xr_features/xr_mode");
-		if (xr_mode_index == 1) {
-			command_line_strings.push_back("--xr_mode_ovr");
-		} else { // XRMode.REGULAR is the default.
-			command_line_strings.push_back("--xr_mode_regular");
-		}
-
-		bool use_32_bit_framebuffer = p_preset->get("graphics/32_bits_framebuffer");
-		if (use_32_bit_framebuffer) {
-			command_line_strings.push_back("--use_depth_32");
-		}
-
-		bool immersive = p_preset->get("screen/immersive_mode");
-		if (immersive) {
-			command_line_strings.push_back("--use_immersive");
-		}
-
-		bool debug_opengl = p_preset->get("graphics/opengl_debug");
-		if (debug_opengl) {
-			command_line_strings.push_back("--debug_opengl");
-		}
-
-		if (command_line_strings.size()) {
-			r_command_line_flags.resize(4);
-			encode_uint32(command_line_strings.size(), &r_command_line_flags.write[0]);
-			for (int i = 0; i < command_line_strings.size(); i++) {
-				print_line(itos(i) + " param: " + command_line_strings[i]);
-				CharString command_line_argument = command_line_strings[i].utf8();
-				int base = r_command_line_flags.size();
-				int length = command_line_argument.length();
-				if (length == 0) {
-					continue;
-				}
-				r_command_line_flags.resize(base + 4 + length);
-				encode_uint32(length, &r_command_line_flags.write[base]);
-				memcpy(&r_command_line_flags.write[base + 4], command_line_argument.ptr(), length);
-			}
-		}
-	}
-
-	Error sign_apk(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &export_path, EditorProgress &ep) {
-		int export_format = int(p_preset->get("custom_template/export_format"));
-		String export_label = export_format == EXPORT_FORMAT_AAB ? "AAB" : "APK";
-		String release_keystore = p_preset->get("keystore/release");
-		String release_username = p_preset->get("keystore/release_user");
-		String release_password = p_preset->get("keystore/release_password");
-
-		String apksigner = get_apksigner_path();
-		print_verbose("Starting signing of the " + export_label + " binary using " + apksigner);
-		if (!FileAccess::exists(apksigner)) {
-			EditorNode::add_io_error(vformat(TTR("'apksigner' could not be found.\nPlease check the command is available in the Android SDK build-tools directory.\nThe resulting %s is unsigned."), export_label));
-			return OK;
-		}
-
-		String keystore;
-		String password;
-		String user;
-		if (p_debug) {
-			keystore = p_preset->get("keystore/debug");
-			password = p_preset->get("keystore/debug_password");
-			user = p_preset->get("keystore/debug_user");
-
-			if (keystore.is_empty()) {
-				keystore = EditorSettings::get_singleton()->get("export/android/debug_keystore");
-				password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass");
-				user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user");
-			}
-
-			if (ep.step(vformat(TTR("Signing debug %s..."), export_label), 104)) {
-				return ERR_SKIP;
-			}
-
-		} else {
-			keystore = release_keystore;
-			password = release_password;
-			user = release_username;
-
-			if (ep.step(vformat(TTR("Signing release %s..."), export_label), 104)) {
-				return ERR_SKIP;
-			}
-		}
-
-		if (!FileAccess::exists(keystore)) {
-			EditorNode::add_io_error(TTR("Could not find keystore, unable to export."));
-			return ERR_FILE_CANT_OPEN;
-		}
-
-		String output;
-		List<String> args;
-		args.push_back("sign");
-		args.push_back("--verbose");
-		args.push_back("--ks");
-		args.push_back(keystore);
-		args.push_back("--ks-pass");
-		args.push_back("pass:" + password);
-		args.push_back("--ks-key-alias");
-		args.push_back(user);
-		args.push_back(export_path);
-		if (p_debug) {
-			// We only print verbose logs for debug builds to avoid leaking release keystore credentials.
-			print_verbose("Signing debug binary using: " + String("\n") + apksigner + " " + join_list(args, String(" ")));
-		}
-		int retval;
-		output.clear();
-		OS::get_singleton()->execute(apksigner, args, &output, &retval, true);
-		print_verbose(output);
-		if (retval) {
-			EditorNode::add_io_error(vformat(TTR("'apksigner' returned with error #%d"), retval));
-			return ERR_CANT_CREATE;
-		}
-
-		if (ep.step(vformat(TTR("Verifying %s..."), export_label), 105)) {
-			return ERR_SKIP;
-		}
-
-		args.clear();
-		args.push_back("verify");
-		args.push_back("--verbose");
-		args.push_back(export_path);
-		if (p_debug) {
-			print_verbose("Verifying signed build using: " + String("\n") + apksigner + " " + join_list(args, String(" ")));
-		}
-
-		output.clear();
-		OS::get_singleton()->execute(apksigner, args, &output, &retval, true);
-		print_verbose(output);
-		if (retval) {
-			EditorNode::add_io_error(vformat(TTR("'apksigner' verification of %s failed."), export_label));
-			return ERR_CANT_CREATE;
-		}
-
-		print_verbose("Successfully completed signing build.");
-		return OK;
-	}
-
-	void _clear_assets_directory() {
-		DirAccessRef da_res = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-		if (da_res->dir_exists("res://android/build/assets")) {
-			print_verbose("Clearing assets directory..");
-			DirAccessRef da_assets = DirAccess::open("res://android/build/assets");
-			da_assets->erase_contents_recursive();
-			da_res->remove("res://android/build/assets");
-		}
-	}
-
-	void _remove_copied_libs() {
-		print_verbose("Removing previously installed libraries...");
-		Error error;
-		String libs_json = FileAccess::get_file_as_string(GDNATIVE_LIBS_PATH, &error);
-		if (error || libs_json.is_empty()) {
-			print_verbose("No previously installed libraries found");
-			return;
-		}
-
-		JSON json;
-		error = json.parse(libs_json);
-		ERR_FAIL_COND_MSG(error, "Error parsing \"" + libs_json + "\" on line " + itos(json.get_error_line()) + ": " + json.get_error_message());
-
-		Vector<String> libs = json.get_data();
-		DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-		for (int i = 0; i < libs.size(); i++) {
-			print_verbose("Removing previously installed library " + libs[i]);
-			da->remove(libs[i]);
-		}
-		da->remove(GDNATIVE_LIBS_PATH);
-	}
-
-	String join_list(List<String> parts, const String &separator) const {
-		String ret;
-		for (int i = 0; i < parts.size(); ++i) {
-			if (i > 0) {
-				ret += separator;
-			}
-			ret += parts[i];
-		}
-		return ret;
-	}
-
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override {
-		int export_format = int(p_preset->get("custom_template/export_format"));
-		bool should_sign = p_preset->get("package/signed");
-		return export_project_helper(p_preset, p_debug, p_path, export_format, should_sign, p_flags);
-	}
-
-	Error export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int export_format, bool should_sign, int p_flags) {
-		ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-
-		String src_apk;
-		Error err;
-
-		EditorProgress ep("export", TTR("Exporting for Android"), 105, true);
-
-		bool use_custom_build = bool(p_preset->get("custom_template/use_custom_build"));
-		bool p_give_internet = p_flags & (DEBUG_FLAG_DUMB_CLIENT | DEBUG_FLAG_REMOTE_DEBUG);
-		bool apk_expansion = p_preset->get("apk_expansion/enable");
-		Vector<String> enabled_abis = get_enabled_abis(p_preset);
-
-		print_verbose("Exporting for Android...");
-		print_verbose("- debug build: " + bool_to_string(p_debug));
-		print_verbose("- export path: " + p_path);
-		print_verbose("- export format: " + itos(export_format));
-		print_verbose("- sign build: " + bool_to_string(should_sign));
-		print_verbose("- custom build enabled: " + bool_to_string(use_custom_build));
-		print_verbose("- apk expansion enabled: " + bool_to_string(apk_expansion));
-		print_verbose("- enabled abis: " + String(",").join(enabled_abis));
-		print_verbose("- export filter: " + itos(p_preset->get_export_filter()));
-		print_verbose("- include filter: " + p_preset->get_include_filter());
-		print_verbose("- exclude filter: " + p_preset->get_exclude_filter());
-
-		Ref<Image> splash_image;
-		Ref<Image> splash_bg_color_image;
-		String processed_splash_config_xml = load_splash_refs(splash_image, splash_bg_color_image);
-
-		Ref<Image> main_image;
-		Ref<Image> foreground;
-		Ref<Image> background;
-
-		load_icon_refs(p_preset, main_image, foreground, background);
-
-		Vector<uint8_t> command_line_flags;
-		// Write command line flags into the command_line_flags variable.
-		get_command_line_flags(p_preset, p_path, p_flags, command_line_flags);
-
-		if (export_format == EXPORT_FORMAT_AAB) {
-			if (!p_path.ends_with(".aab")) {
-				EditorNode::get_singleton()->show_warning(TTR("Invalid filename! Android App Bundle requires the *.aab extension."));
-				return ERR_UNCONFIGURED;
-			}
-			if (apk_expansion) {
-				EditorNode::get_singleton()->show_warning(TTR("APK Expansion not compatible with Android App Bundle."));
-				return ERR_UNCONFIGURED;
-			}
-		}
-		if (export_format == EXPORT_FORMAT_APK && !p_path.ends_with(".apk")) {
-			EditorNode::get_singleton()->show_warning(
-					TTR("Invalid filename! Android APK requires the *.apk extension."));
-			return ERR_UNCONFIGURED;
-		}
-		if (export_format > EXPORT_FORMAT_AAB || export_format < EXPORT_FORMAT_APK) {
-			EditorNode::add_io_error(TTR("Unsupported export format!\n"));
-			return ERR_UNCONFIGURED; //TODO: is this the right error?
-		}
-
-		if (use_custom_build) {
-			print_verbose("Starting custom build..");
-			//test that installed build version is alright
-			{
-				print_verbose("Checking build version..");
-				FileAccessRef f = FileAccess::open("res://android/.build_version", FileAccess::READ);
-				if (!f) {
-					EditorNode::get_singleton()->show_warning(TTR("Trying to build from a custom built template, but no version info for it exists. Please reinstall from the 'Project' menu."));
-					return ERR_UNCONFIGURED;
-				}
-				String version = f->get_line().strip_edges();
-				print_verbose("- build version: " + version);
-				f->close();
-				if (version != VERSION_FULL_CONFIG) {
-					EditorNode::get_singleton()->show_warning(vformat(TTR("Android build version mismatch:\n   Template installed: %s\n   Godot Version: %s\nPlease reinstall Android build template from 'Project' menu."), version, VERSION_FULL_CONFIG));
-					return ERR_UNCONFIGURED;
-				}
-			}
-			String sdk_path = EDITOR_GET("export/android/android_sdk_path");
-			ERR_FAIL_COND_V_MSG(sdk_path.is_empty(), ERR_UNCONFIGURED, "Android SDK path must be configured in Editor Settings at 'export/android/android_sdk_path'.");
-			print_verbose("Android sdk path: " + sdk_path);
-
-			// TODO: should we use "package/name" or "application/config/name"?
-			String project_name = get_project_name(p_preset->get("package/name"));
-			err = _create_project_name_strings_files(p_preset, project_name); //project name localization.
-			if (err != OK) {
-				EditorNode::add_io_error(TTR("Unable to overwrite res://android/build/res/*.xml files with project name"));
-			}
-			// Copies the project icon files into the appropriate Gradle project directory.
-			_copy_icons_to_gradle_project(p_preset, processed_splash_config_xml, splash_image, splash_bg_color_image, main_image, foreground, background);
-			// Write an AndroidManifest.xml file into the Gradle project directory.
-			_write_tmp_manifest(p_preset, p_give_internet, p_debug);
-
-			//stores all the project files inside the Gradle project directory. Also includes all ABIs
-			_clear_assets_directory();
-			_remove_copied_libs();
-			if (!apk_expansion) {
-				print_verbose("Exporting project files..");
-				CustomExportData user_data;
-				user_data.debug = p_debug;
-				err = export_project_files(p_preset, rename_and_store_file_in_gradle_project, &user_data, copy_gradle_so);
-				if (err != OK) {
-					EditorNode::add_io_error(TTR("Could not export project files to gradle project\n"));
-					return err;
-				}
-				if (user_data.libs.size() > 0) {
-					FileAccessRef fa = FileAccess::open(GDNATIVE_LIBS_PATH, FileAccess::WRITE);
-					JSON json;
-					fa->store_string(json.stringify(user_data.libs, "\t"));
-					fa->close();
-				}
-			} else {
-				print_verbose("Saving apk expansion file..");
-				err = save_apk_expansion_file(p_preset, p_path);
-				if (err != OK) {
-					EditorNode::add_io_error(TTR("Could not write expansion package file!"));
-					return err;
-				}
-			}
-			print_verbose("Storing command line flags..");
-			store_file_at_path("res://android/build/assets/_cl_", command_line_flags);
-
-			print_verbose("Updating ANDROID_HOME environment to " + sdk_path);
-			OS::get_singleton()->set_environment("ANDROID_HOME", sdk_path); //set and overwrite if required
-			String build_command;
-
-#ifdef WINDOWS_ENABLED
-			build_command = "gradlew.bat";
-#else
-			build_command = "gradlew";
-#endif
-
-			String build_path = ProjectSettings::get_singleton()->get_resource_path().plus_file("android/build");
-			build_command = build_path.plus_file(build_command);
-
-			String package_name = get_package_name(p_preset->get("package/unique_name"));
-			String version_code = itos(p_preset->get("version/code"));
-			String version_name = p_preset->get("version/name");
-			String enabled_abi_string = String("|").join(enabled_abis);
-			String sign_flag = should_sign ? "true" : "false";
-			String zipalign_flag = "true";
-
-			Vector<PluginConfigAndroid> enabled_plugins = get_enabled_plugins(p_preset);
-			String local_plugins_binaries = get_plugins_binaries(PluginConfigAndroid::BINARY_TYPE_LOCAL, enabled_plugins);
-			String remote_plugins_binaries = get_plugins_binaries(PluginConfigAndroid::BINARY_TYPE_REMOTE, enabled_plugins);
-			String custom_maven_repos = get_plugins_custom_maven_repos(enabled_plugins);
-			bool clean_build_required = is_clean_build_required(enabled_plugins);
-
-			List<String> cmdline;
-			if (clean_build_required) {
-				cmdline.push_back("clean");
-			}
-
-			String build_type = p_debug ? "Debug" : "Release";
-			if (export_format == EXPORT_FORMAT_AAB) {
-				String bundle_build_command = vformat("bundle%s", build_type);
-				cmdline.push_back(bundle_build_command);
-			} else if (export_format == EXPORT_FORMAT_APK) {
-				String apk_build_command = vformat("assemble%s", build_type);
-				cmdline.push_back(apk_build_command);
-			}
-
-			cmdline.push_back("-p"); // argument to specify the start directory.
-			cmdline.push_back(build_path); // start directory.
-			cmdline.push_back("-Pexport_package_name=" + package_name); // argument to specify the package name.
-			cmdline.push_back("-Pexport_version_code=" + version_code); // argument to specify the version code.
-			cmdline.push_back("-Pexport_version_name=" + version_name); // argument to specify the version name.
-			cmdline.push_back("-Pexport_enabled_abis=" + enabled_abi_string); // argument to specify enabled ABIs.
-			cmdline.push_back("-Pplugins_local_binaries=" + local_plugins_binaries); // argument to specify the list of plugins local dependencies.
-			cmdline.push_back("-Pplugins_remote_binaries=" + remote_plugins_binaries); // argument to specify the list of plugins remote dependencies.
-			cmdline.push_back("-Pplugins_maven_repos=" + custom_maven_repos); // argument to specify the list of custom maven repos for the plugins dependencies.
-			cmdline.push_back("-Pperform_zipalign=" + zipalign_flag); // argument to specify whether the build should be zipaligned.
-			cmdline.push_back("-Pperform_signing=" + sign_flag); // argument to specify whether the build should be signed.
-			cmdline.push_back("-Pgodot_editor_version=" + String(VERSION_FULL_CONFIG));
-
-			// NOTE: The release keystore is not included in the verbose logging
-			// to avoid accidentally leaking sensitive information when sharing verbose logs for troubleshooting.
-			// Any non-sensitive additions to the command line arguments must be done above this section.
-			// Sensitive additions must be done below the logging statement.
-			print_verbose("Build Android project using gradle command: " + String("\n") + build_command + " " + join_list(cmdline, String(" ")));
-
-			if (should_sign) {
-				if (p_debug) {
-					String debug_keystore = p_preset->get("keystore/debug");
-					String debug_password = p_preset->get("keystore/debug_password");
-					String debug_user = p_preset->get("keystore/debug_user");
-
-					if (debug_keystore.is_empty()) {
-						debug_keystore = EditorSettings::get_singleton()->get("export/android/debug_keystore");
-						debug_password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass");
-						debug_user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user");
-					}
-
-					cmdline.push_back("-Pdebug_keystore_file=" + debug_keystore); // argument to specify the debug keystore file.
-					cmdline.push_back("-Pdebug_keystore_alias=" + debug_user); // argument to specify the debug keystore alias.
-					cmdline.push_back("-Pdebug_keystore_password=" + debug_password); // argument to specify the debug keystore password.
-				} else {
-					// Pass the release keystore info as well
-					String release_keystore = p_preset->get("keystore/release");
-					String release_username = p_preset->get("keystore/release_user");
-					String release_password = p_preset->get("keystore/release_password");
-					if (!FileAccess::exists(release_keystore)) {
-						EditorNode::add_io_error(TTR("Could not find keystore, unable to export."));
-						return ERR_FILE_CANT_OPEN;
-					}
-
-					cmdline.push_back("-Prelease_keystore_file=" + release_keystore); // argument to specify the release keystore file.
-					cmdline.push_back("-Prelease_keystore_alias=" + release_username); // argument to specify the release keystore alias.
-					cmdline.push_back("-Prelease_keystore_password=" + release_password); // argument to specify the release keystore password.
-				}
-			}
-
-			int result = EditorNode::get_singleton()->execute_and_show_output(TTR("Building Android Project (gradle)"), build_command, cmdline);
-			if (result != 0) {
-				EditorNode::get_singleton()->show_warning(TTR("Building of Android project failed, check output for the error.\nAlternatively visit docs.godotengine.org for Android build documentation."));
-				return ERR_CANT_CREATE;
-			}
-
-			List<String> copy_args;
-			String copy_command;
-			if (export_format == EXPORT_FORMAT_AAB) {
-				copy_command = vformat("copyAndRename%sAab", build_type);
-			} else if (export_format == EXPORT_FORMAT_APK) {
-				copy_command = vformat("copyAndRename%sApk", build_type);
-			}
-
-			copy_args.push_back(copy_command);
-
-			copy_args.push_back("-p"); // argument to specify the start directory.
-			copy_args.push_back(build_path); // start directory.
-
-			String export_filename = p_path.get_file();
-			String export_path = p_path.get_base_dir();
-			if (export_path.is_rel_path()) {
-				export_path = OS::get_singleton()->get_resource_dir().plus_file(export_path);
-			}
-			export_path = ProjectSettings::get_singleton()->globalize_path(export_path).simplify_path();
-
-			copy_args.push_back("-Pexport_path=file:" + export_path);
-			copy_args.push_back("-Pexport_filename=" + export_filename);
-
-			print_verbose("Copying Android binary using gradle command: " + String("\n") + build_command + " " + join_list(copy_args, String(" ")));
-			int copy_result = EditorNode::get_singleton()->execute_and_show_output(TTR("Moving output"), build_command, copy_args);
-			if (copy_result != 0) {
-				EditorNode::get_singleton()->show_warning(TTR("Unable to copy and rename export file, check gradle project directory for outputs."));
-				return ERR_CANT_CREATE;
-			}
-
-			print_verbose("Successfully completed Android custom build.");
-			return OK;
-		}
-		// This is the start of the Legacy build system
-		print_verbose("Starting legacy build system..");
-		if (p_debug) {
-			src_apk = p_preset->get("custom_template/debug");
-		} else {
-			src_apk = p_preset->get("custom_template/release");
-		}
-		src_apk = src_apk.strip_edges();
-		if (src_apk == "") {
-			if (p_debug) {
-				src_apk = find_export_template("android_debug.apk");
-			} else {
-				src_apk = find_export_template("android_release.apk");
-			}
-			if (src_apk == "") {
-				EditorNode::add_io_error(vformat(TTR("Package not found: %s"), src_apk));
-				return ERR_FILE_NOT_FOUND;
-			}
-		}
-
-		if (!DirAccess::exists(p_path.get_base_dir())) {
-			return ERR_FILE_BAD_PATH;
-		}
-
-		FileAccess *src_f = nullptr;
-		zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
-
-		if (ep.step(TTR("Creating APK..."), 0)) {
-			return ERR_SKIP;
-		}
-
-		unzFile pkg = unzOpen2(src_apk.utf8().get_data(), &io);
-		if (!pkg) {
-			EditorNode::add_io_error(vformat(TTR("Could not find template APK to export:\n%s"), src_apk));
-			return ERR_FILE_NOT_FOUND;
-		}
-
-		int ret = unzGoToFirstFile(pkg);
-
-		zlib_filefunc_def io2 = io;
-		FileAccess *dst_f = nullptr;
-		io2.opaque = &dst_f;
-
-		String tmp_unaligned_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpexport-unaligned." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
-
-#define CLEANUP_AND_RETURN(m_err)                            \
-	{                                                        \
-		DirAccess::remove_file_or_error(tmp_unaligned_path); \
-		return m_err;                                        \
-	}
-
-		zipFile unaligned_apk = zipOpen2(tmp_unaligned_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2);
-
-		String cmdline = p_preset->get("command_line/extra_args");
-
-		String version_name = p_preset->get("version/name");
-		String package_name = p_preset->get("package/unique_name");
-
-		String apk_expansion_pkey = p_preset->get("apk_expansion/public_key");
-
-		Vector<String> invalid_abis(enabled_abis);
-		while (ret == UNZ_OK) {
-			//get filename
-			unz_file_info info;
-			char fname[16384];
-			ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
-
-			bool skip = false;
-
-			String file = fname;
-
-			Vector<uint8_t> data;
-			data.resize(info.uncompressed_size);
-
-			//read
-			unzOpenCurrentFile(pkg);
-			unzReadCurrentFile(pkg, data.ptrw(), data.size());
-			unzCloseCurrentFile(pkg);
-
-			//write
-			if (file == "AndroidManifest.xml") {
-				_fix_manifest(p_preset, data, p_give_internet);
-			}
-			if (file == "resources.arsc") {
-				_fix_resources(p_preset, data);
-			}
-
-			// Process the splash image
-			if ((file == SPLASH_IMAGE_EXPORT_PATH || file == LEGACY_BUILD_SPLASH_IMAGE_EXPORT_PATH) && splash_image.is_valid() && !splash_image->is_empty()) {
-				_load_image_data(splash_image, data);
-			}
-
-			// Process the splash bg color image
-			if ((file == SPLASH_BG_COLOR_PATH || file == LEGACY_BUILD_SPLASH_BG_COLOR_PATH) && splash_bg_color_image.is_valid() && !splash_bg_color_image->is_empty()) {
-				_load_image_data(splash_bg_color_image, data);
-			}
-
-			for (int i = 0; i < icon_densities_count; ++i) {
-				if (main_image.is_valid() && !main_image->is_empty()) {
-					if (file == launcher_icons[i].export_path) {
-						_process_launcher_icons(file, main_image, launcher_icons[i].dimensions, data);
-					}
-				}
-				if (foreground.is_valid() && !foreground->is_empty()) {
-					if (file == launcher_adaptive_icon_foregrounds[i].export_path) {
-						_process_launcher_icons(file, foreground, launcher_adaptive_icon_foregrounds[i].dimensions, data);
-					}
-				}
-				if (background.is_valid() && !background->is_empty()) {
-					if (file == launcher_adaptive_icon_backgrounds[i].export_path) {
-						_process_launcher_icons(file, background, launcher_adaptive_icon_backgrounds[i].dimensions, data);
-					}
-				}
-			}
-
-			if (file.ends_with(".so")) {
-				bool enabled = false;
-				for (int i = 0; i < enabled_abis.size(); ++i) {
-					if (file.begins_with("lib/" + enabled_abis[i] + "/")) {
-						invalid_abis.erase(enabled_abis[i]);
-						enabled = true;
-						break;
-					}
-				}
-				if (!enabled) {
-					skip = true;
-				}
-			}
-
-			if (file.begins_with("META-INF") && should_sign) {
-				skip = true;
-			}
-
-			if (!skip) {
-				print_line("ADDING: " + file);
-
-				// Respect decision on compression made by AAPT for the export template
-				const bool uncompressed = info.compression_method == 0;
-
-				zip_fileinfo zipfi = get_zip_fileinfo();
-
-				zipOpenNewFileInZip(unaligned_apk,
-						file.utf8().get_data(),
-						&zipfi,
-						nullptr,
-						0,
-						nullptr,
-						0,
-						nullptr,
-						uncompressed ? 0 : Z_DEFLATED,
-						Z_DEFAULT_COMPRESSION);
-
-				zipWriteInFileInZip(unaligned_apk, data.ptr(), data.size());
-				zipCloseFileInZip(unaligned_apk);
-			}
-
-			ret = unzGoToNextFile(pkg);
-		}
-
-		if (!invalid_abis.is_empty()) {
-			String unsupported_arch = String(", ").join(invalid_abis);
-			EditorNode::add_io_error(vformat(TTR("Missing libraries in the export template for the selected architectures: %s.\nPlease build a template with all required libraries, or uncheck the missing architectures in the export preset."), unsupported_arch));
-			CLEANUP_AND_RETURN(ERR_FILE_NOT_FOUND);
-		}
-
-		if (ep.step(TTR("Adding files..."), 1)) {
-			CLEANUP_AND_RETURN(ERR_SKIP);
-		}
-		err = OK;
-
-		if (p_flags & DEBUG_FLAG_DUMB_CLIENT) {
-			APKExportData ed;
-			ed.ep = &ep;
-			ed.apk = unaligned_apk;
-			err = export_project_files(p_preset, ignore_apk_file, &ed, save_apk_so);
-		} else {
-			if (apk_expansion) {
-				err = save_apk_expansion_file(p_preset, p_path);
-				if (err != OK) {
-					EditorNode::add_io_error(TTR("Could not write expansion package file!"));
-					return err;
-				}
-			} else {
-				APKExportData ed;
-				ed.ep = &ep;
-				ed.apk = unaligned_apk;
-				err = export_project_files(p_preset, save_apk_file, &ed, save_apk_so);
-			}
-		}
-
-		if (err != OK) {
-			unzClose(pkg);
-			EditorNode::add_io_error(TTR("Could not export project files"));
-			CLEANUP_AND_RETURN(ERR_SKIP);
-		}
-
-		zip_fileinfo zipfi = get_zip_fileinfo();
-		zipOpenNewFileInZip(unaligned_apk,
-				"assets/_cl_",
-				&zipfi,
-				nullptr,
-				0,
-				nullptr,
-				0,
-				nullptr,
-				0, // No compress (little size gain and potentially slower startup)
-				Z_DEFAULT_COMPRESSION);
-		zipWriteInFileInZip(unaligned_apk, command_line_flags.ptr(), command_line_flags.size());
-		zipCloseFileInZip(unaligned_apk);
-		zipClose(unaligned_apk, nullptr);
-		unzClose(pkg);
-
-		if (err != OK) {
-			CLEANUP_AND_RETURN(err);
-		}
-
-		// Let's zip-align (must be done before signing)
-
-		static const int ZIP_ALIGNMENT = 4;
-
-		// If we're not signing the apk, then the next step should be the last.
-		const int next_step = should_sign ? 103 : 105;
-		if (ep.step(TTR("Aligning APK..."), next_step)) {
-			CLEANUP_AND_RETURN(ERR_SKIP);
-		}
-
-		unzFile tmp_unaligned = unzOpen2(tmp_unaligned_path.utf8().get_data(), &io);
-		if (!tmp_unaligned) {
-			EditorNode::add_io_error(TTR("Could not unzip temporary unaligned APK."));
-			CLEANUP_AND_RETURN(ERR_FILE_NOT_FOUND);
-		}
-
-		ret = unzGoToFirstFile(tmp_unaligned);
-
-		io2 = io;
-		dst_f = nullptr;
-		io2.opaque = &dst_f;
-		zipFile final_apk = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2);
-
-		// Take files from the unaligned APK and write them out to the aligned one
-		// in raw mode, i.e. not uncompressing and recompressing, aligning them as needed,
-		// following what is done in https://github.com/android/platform_build/blob/master/tools/zipalign/ZipAlign.cpp
-		int bias = 0;
-		while (ret == UNZ_OK) {
-			unz_file_info info;
-			memset(&info, 0, sizeof(info));
-
-			char fname[16384];
-			char extra[16384];
-			ret = unzGetCurrentFileInfo(tmp_unaligned, &info, fname, 16384, extra, 16384 - ZIP_ALIGNMENT, nullptr, 0);
-
-			String file = fname;
-
-			Vector<uint8_t> data;
-			data.resize(info.compressed_size);
-
-			// read
-			int method, level;
-			unzOpenCurrentFile2(tmp_unaligned, &method, &level, 1); // raw read
-			long file_offset = unzGetCurrentFileZStreamPos64(tmp_unaligned);
-			unzReadCurrentFile(tmp_unaligned, data.ptrw(), data.size());
-			unzCloseCurrentFile(tmp_unaligned);
-
-			// align
-			int padding = 0;
-			if (!info.compression_method) {
-				// Uncompressed file => Align
-				long new_offset = file_offset + bias;
-				padding = (ZIP_ALIGNMENT - (new_offset % ZIP_ALIGNMENT)) % ZIP_ALIGNMENT;
-			}
-
-			memset(extra + info.size_file_extra, 0, padding);
-
-			zip_fileinfo fileinfo = get_zip_fileinfo();
-			zipOpenNewFileInZip2(final_apk,
-					file.utf8().get_data(),
-					&fileinfo,
-					extra,
-					info.size_file_extra + padding,
-					nullptr,
-					0,
-					nullptr,
-					method,
-					level,
-					1); // raw write
-			zipWriteInFileInZip(final_apk, data.ptr(), data.size());
-			zipCloseFileInZipRaw(final_apk, info.uncompressed_size, info.crc);
-
-			bias += padding;
-
-			ret = unzGoToNextFile(tmp_unaligned);
-		}
-
-		zipClose(final_apk, nullptr);
-		unzClose(tmp_unaligned);
-
-		if (should_sign) {
-			// Signing must be done last as any additional modifications to the
-			// file will invalidate the signature.
-			err = sign_apk(p_preset, p_debug, p_path, ep);
-			if (err != OK) {
-				CLEANUP_AND_RETURN(err);
-			}
-		}
-
-		CLEANUP_AND_RETURN(OK);
-	}
-
-	virtual void get_platform_features(List<String> *r_features) override {
-		r_features->push_back("mobile");
-		r_features->push_back("Android");
-	}
-
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
-	}
-
-	EditorExportPlatformAndroid() {
-		Ref<Image> img = memnew(Image(_android_logo));
-		logo.instantiate();
-		logo->create_from_image(img);
-
-		img = Ref<Image>(memnew(Image(_android_run_icon)));
-		run_icon.instantiate();
-		run_icon->create_from_image(img);
-
-		devices_changed.set();
-		plugins_changed.set();
-		check_for_changes_thread.start(_check_for_changes_poll_thread, this);
-	}
-
-	~EditorExportPlatformAndroid() {
-		quit_request.set();
-		check_for_changes_thread.wait_to_finish();
-	}
-};
+#include "export_plugin.h"
 
 void register_android_exporter() {
 	String exe_ext;
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
new file mode 100644
index 0000000000..6c2e481856
--- /dev/null
+++ b/platform/android/export/export_plugin.cpp
@@ -0,0 +1,2945 @@
+/*************************************************************************/
+/*  export_plugin.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "export_plugin.h"
+
+static const char *android_perms[] = {
+	"ACCESS_CHECKIN_PROPERTIES",
+	"ACCESS_COARSE_LOCATION",
+	"ACCESS_FINE_LOCATION",
+	"ACCESS_LOCATION_EXTRA_COMMANDS",
+	"ACCESS_MOCK_LOCATION",
+	"ACCESS_NETWORK_STATE",
+	"ACCESS_SURFACE_FLINGER",
+	"ACCESS_WIFI_STATE",
+	"ACCOUNT_MANAGER",
+	"ADD_VOICEMAIL",
+	"AUTHENTICATE_ACCOUNTS",
+	"BATTERY_STATS",
+	"BIND_ACCESSIBILITY_SERVICE",
+	"BIND_APPWIDGET",
+	"BIND_DEVICE_ADMIN",
+	"BIND_INPUT_METHOD",
+	"BIND_NFC_SERVICE",
+	"BIND_NOTIFICATION_LISTENER_SERVICE",
+	"BIND_PRINT_SERVICE",
+	"BIND_REMOTEVIEWS",
+	"BIND_TEXT_SERVICE",
+	"BIND_VPN_SERVICE",
+	"BIND_WALLPAPER",
+	"BLUETOOTH",
+	"BLUETOOTH_ADMIN",
+	"BLUETOOTH_PRIVILEGED",
+	"BRICK",
+	"BROADCAST_PACKAGE_REMOVED",
+	"BROADCAST_SMS",
+	"BROADCAST_STICKY",
+	"BROADCAST_WAP_PUSH",
+	"CALL_PHONE",
+	"CALL_PRIVILEGED",
+	"CAMERA",
+	"CAPTURE_AUDIO_OUTPUT",
+	"CAPTURE_SECURE_VIDEO_OUTPUT",
+	"CAPTURE_VIDEO_OUTPUT",
+	"CHANGE_COMPONENT_ENABLED_STATE",
+	"CHANGE_CONFIGURATION",
+	"CHANGE_NETWORK_STATE",
+	"CHANGE_WIFI_MULTICAST_STATE",
+	"CHANGE_WIFI_STATE",
+	"CLEAR_APP_CACHE",
+	"CLEAR_APP_USER_DATA",
+	"CONTROL_LOCATION_UPDATES",
+	"DELETE_CACHE_FILES",
+	"DELETE_PACKAGES",
+	"DEVICE_POWER",
+	"DIAGNOSTIC",
+	"DISABLE_KEYGUARD",
+	"DUMP",
+	"EXPAND_STATUS_BAR",
+	"FACTORY_TEST",
+	"FLASHLIGHT",
+	"FORCE_BACK",
+	"GET_ACCOUNTS",
+	"GET_PACKAGE_SIZE",
+	"GET_TASKS",
+	"GET_TOP_ACTIVITY_INFO",
+	"GLOBAL_SEARCH",
+	"HARDWARE_TEST",
+	"INJECT_EVENTS",
+	"INSTALL_LOCATION_PROVIDER",
+	"INSTALL_PACKAGES",
+	"INSTALL_SHORTCUT",
+	"INTERNAL_SYSTEM_WINDOW",
+	"INTERNET",
+	"KILL_BACKGROUND_PROCESSES",
+	"LOCATION_HARDWARE",
+	"MANAGE_ACCOUNTS",
+	"MANAGE_APP_TOKENS",
+	"MANAGE_DOCUMENTS",
+	"MASTER_CLEAR",
+	"MEDIA_CONTENT_CONTROL",
+	"MODIFY_AUDIO_SETTINGS",
+	"MODIFY_PHONE_STATE",
+	"MOUNT_FORMAT_FILESYSTEMS",
+	"MOUNT_UNMOUNT_FILESYSTEMS",
+	"NFC",
+	"PERSISTENT_ACTIVITY",
+	"PROCESS_OUTGOING_CALLS",
+	"READ_CALENDAR",
+	"READ_CALL_LOG",
+	"READ_CONTACTS",
+	"READ_EXTERNAL_STORAGE",
+	"READ_FRAME_BUFFER",
+	"READ_HISTORY_BOOKMARKS",
+	"READ_INPUT_STATE",
+	"READ_LOGS",
+	"READ_PHONE_STATE",
+	"READ_PROFILE",
+	"READ_SMS",
+	"READ_SOCIAL_STREAM",
+	"READ_SYNC_SETTINGS",
+	"READ_SYNC_STATS",
+	"READ_USER_DICTIONARY",
+	"REBOOT",
+	"RECEIVE_BOOT_COMPLETED",
+	"RECEIVE_MMS",
+	"RECEIVE_SMS",
+	"RECEIVE_WAP_PUSH",
+	"RECORD_AUDIO",
+	"REORDER_TASKS",
+	"RESTART_PACKAGES",
+	"SEND_RESPOND_VIA_MESSAGE",
+	"SEND_SMS",
+	"SET_ACTIVITY_WATCHER",
+	"SET_ALARM",
+	"SET_ALWAYS_FINISH",
+	"SET_ANIMATION_SCALE",
+	"SET_DEBUG_APP",
+	"SET_ORIENTATION",
+	"SET_POINTER_SPEED",
+	"SET_PREFERRED_APPLICATIONS",
+	"SET_PROCESS_LIMIT",
+	"SET_TIME",
+	"SET_TIME_ZONE",
+	"SET_WALLPAPER",
+	"SET_WALLPAPER_HINTS",
+	"SIGNAL_PERSISTENT_PROCESSES",
+	"STATUS_BAR",
+	"SUBSCRIBED_FEEDS_READ",
+	"SUBSCRIBED_FEEDS_WRITE",
+	"SYSTEM_ALERT_WINDOW",
+	"TRANSMIT_IR",
+	"UNINSTALL_SHORTCUT",
+	"UPDATE_DEVICE_STATS",
+	"USE_CREDENTIALS",
+	"USE_SIP",
+	"VIBRATE",
+	"WAKE_LOCK",
+	"WRITE_APN_SETTINGS",
+	"WRITE_CALENDAR",
+	"WRITE_CALL_LOG",
+	"WRITE_CONTACTS",
+	"WRITE_EXTERNAL_STORAGE",
+	"WRITE_GSERVICES",
+	"WRITE_HISTORY_BOOKMARKS",
+	"WRITE_PROFILE",
+	"WRITE_SECURE_SETTINGS",
+	"WRITE_SETTINGS",
+	"WRITE_SMS",
+	"WRITE_SOCIAL_STREAM",
+	"WRITE_SYNC_SETTINGS",
+	"WRITE_USER_DICTIONARY",
+	nullptr
+};
+
+static const char *SPLASH_IMAGE_EXPORT_PATH = "res/drawable-nodpi/splash.png";
+static const char *LEGACY_BUILD_SPLASH_IMAGE_EXPORT_PATH = "res/drawable-nodpi-v4/splash.png";
+static const char *SPLASH_BG_COLOR_PATH = "res/drawable-nodpi/splash_bg_color.png";
+static const char *LEGACY_BUILD_SPLASH_BG_COLOR_PATH = "res/drawable-nodpi-v4/splash_bg_color.png";
+static const char *SPLASH_CONFIG_PATH = "res://android/build/res/drawable/splash_drawable.xml";
+static const char *GDNATIVE_LIBS_PATH = "res://android/build/libs/gdnativelibs.json";
+
+static const int icon_densities_count = 6;
+static const char *launcher_icon_option = "launcher_icons/main_192x192";
+static const char *launcher_adaptive_icon_foreground_option = "launcher_icons/adaptive_foreground_432x432";
+static const char *launcher_adaptive_icon_background_option = "launcher_icons/adaptive_background_432x432";
+
+static const LauncherIcon launcher_icons[icon_densities_count] = {
+	{ "res/mipmap-xxxhdpi-v4/icon.png", 192 },
+	{ "res/mipmap-xxhdpi-v4/icon.png", 144 },
+	{ "res/mipmap-xhdpi-v4/icon.png", 96 },
+	{ "res/mipmap-hdpi-v4/icon.png", 72 },
+	{ "res/mipmap-mdpi-v4/icon.png", 48 },
+	{ "res/mipmap/icon.png", 192 }
+};
+
+static const LauncherIcon launcher_adaptive_icon_foregrounds[icon_densities_count] = {
+	{ "res/mipmap-xxxhdpi-v4/icon_foreground.png", 432 },
+	{ "res/mipmap-xxhdpi-v4/icon_foreground.png", 324 },
+	{ "res/mipmap-xhdpi-v4/icon_foreground.png", 216 },
+	{ "res/mipmap-hdpi-v4/icon_foreground.png", 162 },
+	{ "res/mipmap-mdpi-v4/icon_foreground.png", 108 },
+	{ "res/mipmap/icon_foreground.png", 432 }
+};
+
+static const LauncherIcon launcher_adaptive_icon_backgrounds[icon_densities_count] = {
+	{ "res/mipmap-xxxhdpi-v4/icon_background.png", 432 },
+	{ "res/mipmap-xxhdpi-v4/icon_background.png", 324 },
+	{ "res/mipmap-xhdpi-v4/icon_background.png", 216 },
+	{ "res/mipmap-hdpi-v4/icon_background.png", 162 },
+	{ "res/mipmap-mdpi-v4/icon_background.png", 108 },
+	{ "res/mipmap/icon_background.png", 432 }
+};
+
+static const int EXPORT_FORMAT_APK = 0;
+static const int EXPORT_FORMAT_AAB = 1;
+
+void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
+	EditorExportPlatformAndroid *ea = (EditorExportPlatformAndroid *)ud;
+
+	while (!ea->quit_request.is_set()) {
+		// Check for plugins updates
+		{
+			// Nothing to do if we already know the plugins have changed.
+			if (!ea->plugins_changed.is_set()) {
+				Vector<PluginConfigAndroid> loaded_plugins = get_plugins();
+
+				MutexLock lock(ea->plugins_lock);
+
+				if (ea->plugins.size() != loaded_plugins.size()) {
+					ea->plugins_changed.set();
+				} else {
+					for (int i = 0; i < ea->plugins.size(); i++) {
+						if (ea->plugins[i].name != loaded_plugins[i].name) {
+							ea->plugins_changed.set();
+							break;
+						}
+					}
+				}
+
+				if (ea->plugins_changed.is_set()) {
+					ea->plugins = loaded_plugins;
+				}
+			}
+		}
+
+		// Check for devices updates
+		String adb = get_adb_path();
+		if (FileAccess::exists(adb)) {
+			String devices;
+			List<String> args;
+			args.push_back("devices");
+			int ec;
+			OS::get_singleton()->execute(adb, args, &devices, &ec);
+
+			Vector<String> ds = devices.split("\n");
+			Vector<String> ldevices;
+			for (int i = 1; i < ds.size(); i++) {
+				String d = ds[i];
+				int dpos = d.find("device");
+				if (dpos == -1) {
+					continue;
+				}
+				d = d.substr(0, dpos).strip_edges();
+				ldevices.push_back(d);
+			}
+
+			MutexLock lock(ea->device_lock);
+
+			bool different = false;
+
+			if (ea->devices.size() != ldevices.size()) {
+				different = true;
+			} else {
+				for (int i = 0; i < ea->devices.size(); i++) {
+					if (ea->devices[i].id != ldevices[i]) {
+						different = true;
+						break;
+					}
+				}
+			}
+
+			if (different) {
+				Vector<Device> ndevices;
+
+				for (int i = 0; i < ldevices.size(); i++) {
+					Device d;
+					d.id = ldevices[i];
+					for (int j = 0; j < ea->devices.size(); j++) {
+						if (ea->devices[j].id == ldevices[i]) {
+							d.description = ea->devices[j].description;
+							d.name = ea->devices[j].name;
+							d.api_level = ea->devices[j].api_level;
+						}
+					}
+
+					if (d.description == "") {
+						//in the oven, request!
+						args.clear();
+						args.push_back("-s");
+						args.push_back(d.id);
+						args.push_back("shell");
+						args.push_back("getprop");
+						int ec2;
+						String dp;
+
+						OS::get_singleton()->execute(adb, args, &dp, &ec2);
+
+						Vector<String> props = dp.split("\n");
+						String vendor;
+						String device;
+						d.description = "Device ID: " + d.id + "\n";
+						d.api_level = 0;
+						for (int j = 0; j < props.size(); j++) {
+							// got information by `shell cat /system/build.prop` before and its format is "property=value"
+							// it's now changed to use `shell getporp` because of permission issue with Android 8.0 and above
+							// its format is "[property]: [value]" so changed it as like build.prop
+							String p = props[j];
+							p = p.replace("]: ", "=");
+							p = p.replace("[", "");
+							p = p.replace("]", "");
+
+							if (p.begins_with("ro.product.model=")) {
+								device = p.get_slice("=", 1).strip_edges();
+							} else if (p.begins_with("ro.product.brand=")) {
+								vendor = p.get_slice("=", 1).strip_edges().capitalize();
+							} else if (p.begins_with("ro.build.display.id=")) {
+								d.description += "Build: " + p.get_slice("=", 1).strip_edges() + "\n";
+							} else if (p.begins_with("ro.build.version.release=")) {
+								d.description += "Release: " + p.get_slice("=", 1).strip_edges() + "\n";
+							} else if (p.begins_with("ro.build.version.sdk=")) {
+								d.api_level = p.get_slice("=", 1).to_int();
+							} else if (p.begins_with("ro.product.cpu.abi=")) {
+								d.description += "CPU: " + p.get_slice("=", 1).strip_edges() + "\n";
+							} else if (p.begins_with("ro.product.manufacturer=")) {
+								d.description += "Manufacturer: " + p.get_slice("=", 1).strip_edges() + "\n";
+							} else if (p.begins_with("ro.board.platform=")) {
+								d.description += "Chipset: " + p.get_slice("=", 1).strip_edges() + "\n";
+							} else if (p.begins_with("ro.opengles.version=")) {
+								uint32_t opengl = p.get_slice("=", 1).to_int();
+								d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl)&0xFF) + "\n";
+							}
+						}
+
+						d.name = vendor + " " + device;
+						if (device == String()) {
+							continue;
+						}
+					}
+
+					ndevices.push_back(d);
+				}
+
+				ea->devices = ndevices;
+				ea->devices_changed.set();
+			}
+		}
+
+		uint64_t sleep = 200;
+		uint64_t wait = 3000000;
+		uint64_t time = OS::get_singleton()->get_ticks_usec();
+		while (OS::get_singleton()->get_ticks_usec() - time < wait) {
+			OS::get_singleton()->delay_usec(1000 * sleep);
+			if (ea->quit_request.is_set()) {
+				break;
+			}
+		}
+	}
+
+	if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) {
+		String adb = get_adb_path();
+		if (!FileAccess::exists(adb)) {
+			return; //adb not configured
+		}
+
+		List<String> args;
+		args.push_back("kill-server");
+		OS::get_singleton()->execute(adb, args);
+	};
+}
+
+String EditorExportPlatformAndroid::get_project_name(const String &p_name) const {
+	String aname;
+	if (p_name != "") {
+		aname = p_name;
+	} else {
+		aname = ProjectSettings::get_singleton()->get("application/config/name");
+	}
+
+	if (aname == "") {
+		aname = VERSION_NAME;
+	}
+
+	return aname;
+}
+
+String EditorExportPlatformAndroid::get_package_name(const String &p_package) const {
+	String pname = p_package;
+	String basename = ProjectSettings::get_singleton()->get("application/config/name");
+	basename = basename.to_lower();
+
+	String name;
+	bool first = true;
+	for (int i = 0; i < basename.length(); i++) {
+		char32_t c = basename[i];
+		if (c >= '0' && c <= '9' && first) {
+			continue;
+		}
+		if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) {
+			name += String::chr(c);
+			first = false;
+		}
+	}
+	if (name == "") {
+		name = "noname";
+	}
+
+	pname = pname.replace("$genname", name);
+
+	return pname;
+}
+
+bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package, String *r_error) const {
+	String pname = p_package;
+
+	if (pname.length() == 0) {
+		if (r_error) {
+			*r_error = TTR("Package name is missing.");
+		}
+		return false;
+	}
+
+	int segments = 0;
+	bool first = true;
+	for (int i = 0; i < pname.length(); i++) {
+		char32_t c = pname[i];
+		if (first && c == '.') {
+			if (r_error) {
+				*r_error = TTR("Package segments must be of non-zero length.");
+			}
+			return false;
+		}
+		if (c == '.') {
+			segments++;
+			first = true;
+			continue;
+		}
+		if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_')) {
+			if (r_error) {
+				*r_error = vformat(TTR("The character '%s' is not allowed in Android application package names."), String::chr(c));
+			}
+			return false;
+		}
+		if (first && (c >= '0' && c <= '9')) {
+			if (r_error) {
+				*r_error = TTR("A digit cannot be the first character in a package segment.");
+			}
+			return false;
+		}
+		if (first && c == '_') {
+			if (r_error) {
+				*r_error = vformat(TTR("The character '%s' cannot be the first character in a package segment."), String::chr(c));
+			}
+			return false;
+		}
+		first = false;
+	}
+
+	if (segments == 0) {
+		if (r_error) {
+			*r_error = TTR("The package must have at least one '.' separator.");
+		}
+		return false;
+	}
+
+	if (first) {
+		if (r_error) {
+			*r_error = TTR("Package segments must be of non-zero length.");
+		}
+		return false;
+	}
+
+	return true;
+}
+
+bool EditorExportPlatformAndroid::_should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data) {
+	/*
+     *  By not compressing files with little or not benefit in doing so,
+     *  a performance gain is expected attime. Moreover, if the APK is
+     *  zip-aligned, assets stored as they are can be efficiently read by
+     *  Android by memory-mapping them.
+     */
+
+	// -- Unconditional uncompress to mimic AAPT plus some other
+
+	static const char *unconditional_compress_ext[] = {
+		// From https://github.com/android/platform_frameworks_base/blob/master/tools/aapt/Package.cpp
+		// These formats are already compressed, or don't compress well:
+		".jpg", ".jpeg", ".png", ".gif",
+		".wav", ".mp2", ".mp3", ".ogg", ".aac",
+		".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet",
+		".rtttl", ".imy", ".xmf", ".mp4", ".m4a",
+		".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2",
+		".amr", ".awb", ".wma", ".wmv",
+		// Godot-specific:
+		".webp", // Same reasoning as .png
+		".cfb", // Don't let small config files slow-down startup
+		".scn", // Binary scenes are usually already compressed
+		".stex", // Streamable textures are usually already compressed
+		// Trailer for easier processing
+		nullptr
+	};
+
+	for (const char **ext = unconditional_compress_ext; *ext; ++ext) {
+		if (p_path.to_lower().ends_with(String(*ext))) {
+			return false;
+		}
+	}
+
+	// -- Compressed resource?
+
+	if (p_data.size() >= 4 && p_data[0] == 'R' && p_data[1] == 'S' && p_data[2] == 'C' && p_data[3] == 'C') {
+		// Already compressed
+		return false;
+	}
+
+	// --- TODO: Decide on texture resources according to their image compression setting
+
+	return true;
+}
+
+zip_fileinfo EditorExportPlatformAndroid::get_zip_fileinfo() {
+	OS::Time time = OS::get_singleton()->get_time();
+	OS::Date date = OS::get_singleton()->get_date();
+
+	zip_fileinfo zipfi;
+	zipfi.tmz_date.tm_hour = time.hour;
+	zipfi.tmz_date.tm_mday = date.day;
+	zipfi.tmz_date.tm_min = time.minute;
+	zipfi.tmz_date.tm_mon = date.month - 1; // tm_mon is zero indexed
+	zipfi.tmz_date.tm_sec = time.second;
+	zipfi.tmz_date.tm_year = date.year;
+	zipfi.dosDate = 0;
+	zipfi.external_fa = 0;
+	zipfi.internal_fa = 0;
+
+	return zipfi;
+}
+
+Vector<String> EditorExportPlatformAndroid::get_abis() {
+	Vector<String> abis;
+	abis.push_back("armeabi-v7a");
+	abis.push_back("arm64-v8a");
+	abis.push_back("x86");
+	abis.push_back("x86_64");
+	return abis;
+}
+
+/// List the gdap files in the directory specified by the p_path parameter.
+Vector<String> EditorExportPlatformAndroid::list_gdap_files(const String &p_path) {
+	Vector<String> dir_files;
+	DirAccessRef da = DirAccess::open(p_path);
+	if (da) {
+		da->list_dir_begin();
+		while (true) {
+			String file = da->get_next();
+			if (file == "") {
+				break;
+			}
+
+			if (da->current_is_dir() || da->current_is_hidden()) {
+				continue;
+			}
+
+			if (file.ends_with(PluginConfigAndroid::PLUGIN_CONFIG_EXT)) {
+				dir_files.push_back(file);
+			}
+		}
+		da->list_dir_end();
+	}
+
+	return dir_files;
+}
+
+Vector<PluginConfigAndroid> EditorExportPlatformAndroid::get_plugins() {
+	Vector<PluginConfigAndroid> loaded_plugins;
+
+	String plugins_dir = ProjectSettings::get_singleton()->get_resource_path().plus_file("android/plugins");
+
+	// Add the prebuilt plugins
+	loaded_plugins.append_array(PluginConfigAndroid::get_prebuilt_plugins(plugins_dir));
+
+	if (DirAccess::exists(plugins_dir)) {
+		Vector<String> plugins_filenames = list_gdap_files(plugins_dir);
+
+		if (!plugins_filenames.is_empty()) {
+			Ref<ConfigFile> config_file = memnew(ConfigFile);
+			for (int i = 0; i < plugins_filenames.size(); i++) {
+				PluginConfigAndroid config = PluginConfigAndroid::load_plugin_config(config_file, plugins_dir.plus_file(plugins_filenames[i]));
+				if (config.valid_config) {
+					loaded_plugins.push_back(config);
+				} else {
+					print_error("Invalid plugin config file " + plugins_filenames[i]);
+				}
+			}
+		}
+	}
+
+	return loaded_plugins;
+}
+
+Vector<PluginConfigAndroid> EditorExportPlatformAndroid::get_enabled_plugins(const Ref<EditorExportPreset> &p_presets) {
+	Vector<PluginConfigAndroid> enabled_plugins;
+	Vector<PluginConfigAndroid> all_plugins = get_plugins();
+	for (int i = 0; i < all_plugins.size(); i++) {
+		PluginConfigAndroid plugin = all_plugins[i];
+		bool enabled = p_presets->get("plugins/" + plugin.name);
+		if (enabled) {
+			enabled_plugins.push_back(plugin);
+		}
+	}
+
+	return enabled_plugins;
+}
+
+Error EditorExportPlatformAndroid::store_in_apk(APKExportData *ed, const String &p_path, const Vector<uint8_t> &p_data, int compression_method) {
+	zip_fileinfo zipfi = get_zip_fileinfo();
+	zipOpenNewFileInZip(ed->apk,
+			p_path.utf8().get_data(),
+			&zipfi,
+			nullptr,
+			0,
+			nullptr,
+			0,
+			nullptr,
+			compression_method,
+			Z_DEFAULT_COMPRESSION);
+
+	zipWriteInFileInZip(ed->apk, p_data.ptr(), p_data.size());
+	zipCloseFileInZip(ed->apk);
+
+	return OK;
+}
+
+Error EditorExportPlatformAndroid::save_apk_so(void *p_userdata, const SharedObject &p_so) {
+	if (!p_so.path.get_file().begins_with("lib")) {
+		String err = "Android .so file names must start with \"lib\", but got: " + p_so.path;
+		ERR_PRINT(err);
+		return FAILED;
+	}
+	APKExportData *ed = (APKExportData *)p_userdata;
+	Vector<String> abis = get_abis();
+	bool exported = false;
+	for (int i = 0; i < p_so.tags.size(); ++i) {
+		// shared objects can be fat (compatible with multiple ABIs)
+		int abi_index = abis.find(p_so.tags[i]);
+		if (abi_index != -1) {
+			exported = true;
+			String abi = abis[abi_index];
+			String dst_path = String("lib").plus_file(abi).plus_file(p_so.path.get_file());
+			Vector<uint8_t> array = FileAccess::get_file_as_array(p_so.path);
+			Error store_err = store_in_apk(ed, dst_path, array);
+			ERR_FAIL_COND_V_MSG(store_err, store_err, "Cannot store in apk file '" + dst_path + "'.");
+		}
+	}
+	if (!exported) {
+		String abis_string = String(" ").join(abis);
+		String err = "Cannot determine ABI for library \"" + p_so.path + "\". One of the supported ABIs must be used as a tag: " + abis_string;
+		ERR_PRINT(err);
+		return FAILED;
+	}
+	return OK;
+}
+
+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) {
+	APKExportData *ed = (APKExportData *)p_userdata;
+	String dst_path = p_path.replace_first("res://", "assets/");
+
+	store_in_apk(ed, dst_path, p_data, _should_compress_asset(p_path, p_data) ? Z_DEFLATED : 0);
+	return OK;
+}
+
+Error EditorExportPlatformAndroid::ignore_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) {
+	return OK;
+}
+
+Error EditorExportPlatformAndroid::copy_gradle_so(void *p_userdata, const SharedObject &p_so) {
+	ERR_FAIL_COND_V_MSG(!p_so.path.get_file().begins_with("lib"), FAILED,
+			"Android .so file names must start with \"lib\", but got: " + p_so.path);
+	Vector<String> abis = get_abis();
+	CustomExportData *export_data = (CustomExportData *)p_userdata;
+	bool exported = false;
+	for (int i = 0; i < p_so.tags.size(); ++i) {
+		int abi_index = abis.find(p_so.tags[i]);
+		if (abi_index != -1) {
+			exported = true;
+			String base = "res://android/build/libs";
+			String type = export_data->debug ? "debug" : "release";
+			String abi = abis[abi_index];
+			String filename = p_so.path.get_file();
+			String dst_path = base.plus_file(type).plus_file(abi).plus_file(filename);
+			Vector<uint8_t> data = FileAccess::get_file_as_array(p_so.path);
+			print_verbose("Copying .so file from " + p_so.path + " to " + dst_path);
+			Error err = store_file_at_path(dst_path, data);
+			ERR_FAIL_COND_V_MSG(err, err, "Failed to copy .so file from " + p_so.path + " to " + dst_path);
+			export_data->libs.push_back(dst_path);
+		}
+	}
+	ERR_FAIL_COND_V_MSG(!exported, FAILED,
+			"Cannot determine ABI for library \"" + p_so.path + "\". One of the supported ABIs must be used as a tag: " + String(" ").join(abis));
+	return OK;
+}
+
+void EditorExportPlatformAndroid::_get_permissions(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions) {
+	const char **aperms = android_perms;
+	while (*aperms) {
+		bool enabled = p_preset->get("permissions/" + String(*aperms).to_lower());
+		if (enabled) {
+			r_permissions.push_back("android.permission." + String(*aperms));
+		}
+		aperms++;
+	}
+	PackedStringArray user_perms = p_preset->get("permissions/custom_permissions");
+	for (int i = 0; i < user_perms.size(); i++) {
+		String user_perm = user_perms[i].strip_edges();
+		if (!user_perm.is_empty()) {
+			r_permissions.push_back(user_perm);
+		}
+	}
+	if (p_give_internet) {
+		if (r_permissions.find("android.permission.INTERNET") == -1) {
+			r_permissions.push_back("android.permission.INTERNET");
+		}
+	}
+
+	int xr_mode_index = p_preset->get("xr_features/xr_mode");
+	if (xr_mode_index == 1 /* XRMode.OVR */) {
+		int hand_tracking_index = p_preset->get("xr_features/hand_tracking"); // 0: none, 1: optional, 2: required
+		if (hand_tracking_index > 0) {
+			if (r_permissions.find("com.oculus.permission.HAND_TRACKING") == -1) {
+				r_permissions.push_back("com.oculus.permission.HAND_TRACKING");
+			}
+		}
+	}
+}
+
+void EditorExportPlatformAndroid::_write_tmp_manifest(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, bool p_debug) {
+	print_verbose("Building temporary manifest..");
+	String manifest_text =
+			"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+			"<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n"
+			"    xmlns:tools=\"http://schemas.android.com/tools\">\n";
+
+	manifest_text += _get_screen_sizes_tag(p_preset);
+	manifest_text += _get_gles_tag();
+
+	Vector<String> perms;
+	_get_permissions(p_preset, p_give_internet, perms);
+	for (int i = 0; i < perms.size(); i++) {
+		manifest_text += vformat("    <uses-permission android:name=\"%s\" />\n", perms.get(i));
+	}
+
+	manifest_text += _get_xr_features_tag(p_preset);
+	manifest_text += _get_instrumentation_tag(p_preset);
+	manifest_text += _get_application_tag(p_preset);
+	manifest_text += "</manifest>\n";
+	String manifest_path = vformat("res://android/build/src/%s/AndroidManifest.xml", (p_debug ? "debug" : "release"));
+
+	print_verbose("Storing manifest into " + manifest_path + ": " + "\n" + manifest_text);
+	store_string_at_path(manifest_path, manifest_text);
+}
+
+void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_manifest, bool p_give_internet) {
+	// Leaving the unused types commented because looking these constants up
+	// again later would be annoying
+	// const int CHUNK_AXML_FILE = 0x00080003;
+	// const int CHUNK_RESOURCEIDS = 0x00080180;
+	const int CHUNK_STRINGS = 0x001C0001;
+	// const int CHUNK_XML_END_NAMESPACE = 0x00100101;
+	const int CHUNK_XML_END_TAG = 0x00100103;
+	// const int CHUNK_XML_START_NAMESPACE = 0x00100100;
+	const int CHUNK_XML_START_TAG = 0x00100102;
+	// const int CHUNK_XML_TEXT = 0x00100104;
+	const int UTF8_FLAG = 0x00000100;
+
+	Vector<String> string_table;
+
+	uint32_t ofs = 8;
+
+	uint32_t string_count = 0;
+	//uint32_t styles_count = 0;
+	uint32_t string_flags = 0;
+	uint32_t string_data_offset = 0;
+
+	//uint32_t styles_offset = 0;
+	uint32_t string_table_begins = 0;
+	uint32_t string_table_ends = 0;
+	Vector<uint8_t> stable_extra;
+
+	String version_name = p_preset->get("version/name");
+	int version_code = p_preset->get("version/code");
+	String package_name = p_preset->get("package/unique_name");
+
+	const int screen_orientation =
+			_get_android_orientation_value(DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation"))));
+
+	bool screen_support_small = p_preset->get("screen/support_small");
+	bool screen_support_normal = p_preset->get("screen/support_normal");
+	bool screen_support_large = p_preset->get("screen/support_large");
+	bool screen_support_xlarge = p_preset->get("screen/support_xlarge");
+
+	int xr_mode_index = p_preset->get("xr_features/xr_mode");
+
+	bool backup_allowed = p_preset->get("user_data_backup/allow");
+	bool classify_as_game = p_preset->get("package/classify_as_game");
+
+	Vector<String> perms;
+	// Write permissions into the perms variable.
+	_get_permissions(p_preset, p_give_internet, perms);
+
+	while (ofs < (uint32_t)p_manifest.size()) {
+		uint32_t chunk = decode_uint32(&p_manifest[ofs]);
+		uint32_t size = decode_uint32(&p_manifest[ofs + 4]);
+
+		switch (chunk) {
+			case CHUNK_STRINGS: {
+				int iofs = ofs + 8;
+
+				string_count = decode_uint32(&p_manifest[iofs]);
+				//styles_count = decode_uint32(&p_manifest[iofs + 4]);
+				string_flags = decode_uint32(&p_manifest[iofs + 8]);
+				string_data_offset = decode_uint32(&p_manifest[iofs + 12]);
+				//styles_offset = decode_uint32(&p_manifest[iofs + 16]);
+				/*
+                printf("string count: %i\n",string_count);
+                printf("flags: %i\n",string_flags);
+                printf("sdata ofs: %i\n",string_data_offset);
+                printf("styles ofs: %i\n",styles_offset);
+                */
+				uint32_t st_offset = iofs + 20;
+				string_table.resize(string_count);
+				uint32_t string_end = 0;
+
+				string_table_begins = st_offset;
+
+				for (uint32_t i = 0; i < string_count; i++) {
+					uint32_t string_at = decode_uint32(&p_manifest[st_offset + i * 4]);
+					string_at += st_offset + string_count * 4;
+
+					ERR_FAIL_COND_MSG(string_flags & UTF8_FLAG, "Unimplemented, can't read UTF-8 string table.");
+
+					if (string_flags & UTF8_FLAG) {
+					} else {
+						uint32_t len = decode_uint16(&p_manifest[string_at]);
+						Vector<char32_t> ucstring;
+						ucstring.resize(len + 1);
+						for (uint32_t j = 0; j < len; j++) {
+							uint16_t c = decode_uint16(&p_manifest[string_at + 2 + 2 * j]);
+							ucstring.write[j] = c;
+						}
+						string_end = MAX(string_at + 2 + 2 * len, string_end);
+						ucstring.write[len] = 0;
+						string_table.write[i] = ucstring.ptr();
+					}
+				}
+
+				for (uint32_t i = string_end; i < (ofs + size); i++) {
+					stable_extra.push_back(p_manifest[i]);
+				}
+
+				string_table_ends = ofs + size;
+
+			} break;
+			case CHUNK_XML_START_TAG: {
+				int iofs = ofs + 8;
+				uint32_t name = decode_uint32(&p_manifest[iofs + 12]);
+
+				String tname = string_table[name];
+				uint32_t attrcount = decode_uint32(&p_manifest[iofs + 20]);
+				iofs += 28;
+
+				for (uint32_t i = 0; i < attrcount; i++) {
+					uint32_t attr_nspace = decode_uint32(&p_manifest[iofs]);
+					uint32_t attr_name = decode_uint32(&p_manifest[iofs + 4]);
+					uint32_t attr_value = decode_uint32(&p_manifest[iofs + 8]);
+					uint32_t attr_resid = decode_uint32(&p_manifest[iofs + 16]);
+
+					const String value = (attr_value != 0xFFFFFFFF) ? string_table[attr_value] : "Res #" + itos(attr_resid);
+					String attrname = string_table[attr_name];
+					const String nspace = (attr_nspace != 0xFFFFFFFF) ? string_table[attr_nspace] : "";
+
+					//replace project information
+					if (tname == "manifest" && attrname == "package") {
+						string_table.write[attr_value] = get_package_name(package_name);
+					}
+
+					if (tname == "manifest" && attrname == "versionCode") {
+						encode_uint32(version_code, &p_manifest.write[iofs + 16]);
+					}
+
+					if (tname == "manifest" && attrname == "versionName") {
+						if (attr_value == 0xFFFFFFFF) {
+							WARN_PRINT("Version name in a resource, should be plain text");
+						} else {
+							string_table.write[attr_value] = version_name;
+						}
+					}
+
+					if (tname == "application" && attrname == "allowBackup") {
+						encode_uint32(backup_allowed, &p_manifest.write[iofs + 16]);
+					}
+
+					if (tname == "application" && attrname == "isGame") {
+						encode_uint32(classify_as_game, &p_manifest.write[iofs + 16]);
+					}
+
+					if (tname == "instrumentation" && attrname == "targetPackage") {
+						string_table.write[attr_value] = get_package_name(package_name);
+					}
+
+					if (tname == "activity" && attrname == "screenOrientation") {
+						encode_uint32(screen_orientation, &p_manifest.write[iofs + 16]);
+					}
+
+					if (tname == "supports-screens") {
+						if (attrname == "smallScreens") {
+							encode_uint32(screen_support_small ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
+
+						} else if (attrname == "normalScreens") {
+							encode_uint32(screen_support_normal ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
+
+						} else if (attrname == "largeScreens") {
+							encode_uint32(screen_support_large ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
+
+						} else if (attrname == "xlargeScreens") {
+							encode_uint32(screen_support_xlarge ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
+						}
+					}
+
+					iofs += 20;
+				}
+
+			} break;
+			case CHUNK_XML_END_TAG: {
+				int iofs = ofs + 8;
+				uint32_t name = decode_uint32(&p_manifest[iofs + 12]);
+				String tname = string_table[name];
+
+				if (tname == "uses-feature") {
+					Vector<String> feature_names;
+					Vector<bool> feature_required_list;
+					Vector<int> feature_versions;
+
+					if (xr_mode_index == 1 /* XRMode.OVR */) {
+						// Check for hand tracking
+						int hand_tracking_index = p_preset->get("xr_features/hand_tracking"); // 0: none, 1: optional, 2: required
+						if (hand_tracking_index > 0) {
+							feature_names.push_back("oculus.software.handtracking");
+							feature_required_list.push_back(hand_tracking_index == 2);
+							feature_versions.push_back(-1); // no version attribute should be added.
+						}
+					}
+
+					if (feature_names.size() > 0) {
+						ofs += 24; // skip over end tag
+
+						// save manifest ending so we can restore it
+						Vector<uint8_t> manifest_end;
+						uint32_t manifest_cur_size = p_manifest.size();
+
+						manifest_end.resize(p_manifest.size() - ofs);
+						memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
+
+						int32_t attr_name_string = string_table.find("name");
+						ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
+
+						int32_t ns_android_string = string_table.find("http://schemas.android.com/apk/res/android");
+						if (ns_android_string == -1) {
+							string_table.push_back("http://schemas.android.com/apk/res/android");
+							ns_android_string = string_table.size() - 1;
+						}
+
+						int32_t attr_uses_feature_string = string_table.find("uses-feature");
+						if (attr_uses_feature_string == -1) {
+							string_table.push_back("uses-feature");
+							attr_uses_feature_string = string_table.size() - 1;
+						}
+
+						int32_t attr_required_string = string_table.find("required");
+						if (attr_required_string == -1) {
+							string_table.push_back("required");
+							attr_required_string = string_table.size() - 1;
+						}
+
+						for (int i = 0; i < feature_names.size(); i++) {
+							String feature_name = feature_names[i];
+							bool feature_required = feature_required_list[i];
+							int feature_version = feature_versions[i];
+							bool has_version_attribute = feature_version != -1;
+
+							print_line("Adding feature " + feature_name);
+
+							int32_t feature_string = string_table.find(feature_name);
+							if (feature_string == -1) {
+								string_table.push_back(feature_name);
+								feature_string = string_table.size() - 1;
+							}
+
+							String required_value_string = feature_required ? "true" : "false";
+							int32_t required_value = string_table.find(required_value_string);
+							if (required_value == -1) {
+								string_table.push_back(required_value_string);
+								required_value = string_table.size() - 1;
+							}
+
+							int32_t attr_version_string = -1;
+							int32_t version_value = -1;
+							int tag_size;
+							int attr_count;
+							if (has_version_attribute) {
+								attr_version_string = string_table.find("version");
+								if (attr_version_string == -1) {
+									string_table.push_back("version");
+									attr_version_string = string_table.size() - 1;
+								}
+
+								version_value = string_table.find(itos(feature_version));
+								if (version_value == -1) {
+									string_table.push_back(itos(feature_version));
+									version_value = string_table.size() - 1;
+								}
+
+								tag_size = 96; // node and three attrs + end node
+								attr_count = 3;
+							} else {
+								tag_size = 76; // node and two attrs + end node
+								attr_count = 2;
+							}
+							manifest_cur_size += tag_size + 24;
+							p_manifest.resize(manifest_cur_size);
+
+							// start tag
+							encode_uint16(0x102, &p_manifest.write[ofs]); // type
+							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+							encode_uint32(tag_size, &p_manifest.write[ofs + 4]); // size
+							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+							encode_uint32(attr_uses_feature_string, &p_manifest.write[ofs + 20]); // name
+							encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
+							encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
+							encode_uint16(attr_count, &p_manifest.write[ofs + 28]); // num_attrs
+							encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
+							encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
+							encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
+
+							// android:name attribute
+							encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
+							encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
+							encode_uint32(feature_string, &p_manifest.write[ofs + 44]); // raw_value
+							encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
+							p_manifest.write[ofs + 50] = 0; // typedvalue_always0
+							p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
+							encode_uint32(feature_string, &p_manifest.write[ofs + 52]); // typedvalue reference
+
+							// android:required attribute
+							encode_uint32(ns_android_string, &p_manifest.write[ofs + 56]); // ns
+							encode_uint32(attr_required_string, &p_manifest.write[ofs + 60]); // 'name'
+							encode_uint32(required_value, &p_manifest.write[ofs + 64]); // raw_value
+							encode_uint16(8, &p_manifest.write[ofs + 68]); // typedvalue_size
+							p_manifest.write[ofs + 70] = 0; // typedvalue_always0
+							p_manifest.write[ofs + 71] = 0x03; // typedvalue_type (string)
+							encode_uint32(required_value, &p_manifest.write[ofs + 72]); // typedvalue reference
+
+							ofs += 76;
+
+							if (has_version_attribute) {
+								// android:version attribute
+								encode_uint32(ns_android_string, &p_manifest.write[ofs]); // ns
+								encode_uint32(attr_version_string, &p_manifest.write[ofs + 4]); // 'name'
+								encode_uint32(version_value, &p_manifest.write[ofs + 8]); // raw_value
+								encode_uint16(8, &p_manifest.write[ofs + 12]); // typedvalue_size
+								p_manifest.write[ofs + 14] = 0; // typedvalue_always0
+								p_manifest.write[ofs + 15] = 0x03; // typedvalue_type (string)
+								encode_uint32(version_value, &p_manifest.write[ofs + 16]); // typedvalue reference
+
+								ofs += 20;
+							}
+
+							// end tag
+							encode_uint16(0x103, &p_manifest.write[ofs]); // type
+							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+							encode_uint32(24, &p_manifest.write[ofs + 4]); // size
+							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+							encode_uint32(attr_uses_feature_string, &p_manifest.write[ofs + 20]); // name
+
+							ofs += 24;
+						}
+						memcpy(&p_manifest.write[ofs], manifest_end.ptr(), manifest_end.size());
+						ofs -= 24; // go back over back end
+					}
+				}
+				if (tname == "manifest") {
+					// save manifest ending so we can restore it
+					Vector<uint8_t> manifest_end;
+					uint32_t manifest_cur_size = p_manifest.size();
+
+					manifest_end.resize(p_manifest.size() - ofs);
+					memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
+
+					int32_t attr_name_string = string_table.find("name");
+					ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
+
+					int32_t ns_android_string = string_table.find("android");
+					ERR_FAIL_COND_MSG(ns_android_string == -1, "Template does not have 'android' namespace.");
+
+					int32_t attr_uses_permission_string = string_table.find("uses-permission");
+					if (attr_uses_permission_string == -1) {
+						string_table.push_back("uses-permission");
+						attr_uses_permission_string = string_table.size() - 1;
+					}
+
+					for (int i = 0; i < perms.size(); ++i) {
+						print_line("Adding permission " + perms[i]);
+
+						manifest_cur_size += 56 + 24; // node + end node
+						p_manifest.resize(manifest_cur_size);
+
+						// Add permission to the string pool
+						int32_t perm_string = string_table.find(perms[i]);
+						if (perm_string == -1) {
+							string_table.push_back(perms[i]);
+							perm_string = string_table.size() - 1;
+						}
+
+						// start tag
+						encode_uint16(0x102, &p_manifest.write[ofs]); // type
+						encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+						encode_uint32(56, &p_manifest.write[ofs + 4]); // size
+						encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+						encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+						encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+						encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
+						encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
+						encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
+						encode_uint16(1, &p_manifest.write[ofs + 28]); // num_attrs
+						encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
+						encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
+						encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
+
+						// attribute
+						encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
+						encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
+						encode_uint32(perm_string, &p_manifest.write[ofs + 44]); // raw_value
+						encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
+						p_manifest.write[ofs + 50] = 0; // typedvalue_always0
+						p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
+						encode_uint32(perm_string, &p_manifest.write[ofs + 52]); // typedvalue reference
+
+						ofs += 56;
+
+						// end tag
+						encode_uint16(0x103, &p_manifest.write[ofs]); // type
+						encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+						encode_uint32(24, &p_manifest.write[ofs + 4]); // size
+						encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+						encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+						encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+						encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
+
+						ofs += 24;
+					}
+
+					// copy footer back in
+					memcpy(&p_manifest.write[ofs], manifest_end.ptr(), manifest_end.size());
+				}
+			} break;
+		}
+
+		ofs += size;
+	}
+
+	//create new andriodmanifest binary
+
+	Vector<uint8_t> ret;
+	ret.resize(string_table_begins + string_table.size() * 4);
+
+	for (uint32_t i = 0; i < string_table_begins; i++) {
+		ret.write[i] = p_manifest[i];
+	}
+
+	ofs = 0;
+	for (int i = 0; i < string_table.size(); i++) {
+		encode_uint32(ofs, &ret.write[string_table_begins + i * 4]);
+		ofs += string_table[i].length() * 2 + 2 + 2;
+	}
+
+	ret.resize(ret.size() + ofs);
+	string_data_offset = ret.size() - ofs;
+	uint8_t *chars = &ret.write[string_data_offset];
+	for (int i = 0; i < string_table.size(); i++) {
+		String s = string_table[i];
+		encode_uint16(s.length(), chars);
+		chars += 2;
+		for (int j = 0; j < s.length(); j++) {
+			encode_uint16(s[j], chars);
+			chars += 2;
+		}
+		encode_uint16(0, chars);
+		chars += 2;
+	}
+
+	for (int i = 0; i < stable_extra.size(); i++) {
+		ret.push_back(stable_extra[i]);
+	}
+
+	//pad
+	while (ret.size() % 4) {
+		ret.push_back(0);
+	}
+
+	uint32_t new_stable_end = ret.size();
+
+	uint32_t extra = (p_manifest.size() - string_table_ends);
+	ret.resize(new_stable_end + extra);
+	for (uint32_t i = 0; i < extra; i++) {
+		ret.write[new_stable_end + i] = p_manifest[string_table_ends + i];
+	}
+
+	while (ret.size() % 4) {
+		ret.push_back(0);
+	}
+	encode_uint32(ret.size(), &ret.write[4]); //update new file size
+
+	encode_uint32(new_stable_end - 8, &ret.write[12]); //update new string table size
+	encode_uint32(string_table.size(), &ret.write[16]); //update new number of strings
+	encode_uint32(string_data_offset - 8, &ret.write[28]); //update new string data offset
+
+	p_manifest = ret;
+}
+
+String EditorExportPlatformAndroid::_parse_string(const uint8_t *p_bytes, bool p_utf8) {
+	uint32_t offset = 0;
+	uint32_t len = 0;
+
+	if (p_utf8) {
+		uint8_t byte = p_bytes[offset];
+		if (byte & 0x80) {
+			offset += 2;
+		} else {
+			offset += 1;
+		}
+		byte = p_bytes[offset];
+		offset++;
+		if (byte & 0x80) {
+			len = byte & 0x7F;
+			len = (len << 8) + p_bytes[offset];
+			offset++;
+		} else {
+			len = byte;
+		}
+	} else {
+		len = decode_uint16(&p_bytes[offset]);
+		offset += 2;
+		if (len & 0x8000) {
+			len &= 0x7FFF;
+			len = (len << 16) + decode_uint16(&p_bytes[offset]);
+			offset += 2;
+		}
+	}
+
+	if (p_utf8) {
+		Vector<uint8_t> str8;
+		str8.resize(len + 1);
+		for (uint32_t i = 0; i < len; i++) {
+			str8.write[i] = p_bytes[offset + i];
+		}
+		str8.write[len] = 0;
+		String str;
+		str.parse_utf8((const char *)str8.ptr());
+		return str;
+	} else {
+		String str;
+		for (uint32_t i = 0; i < len; i++) {
+			char32_t c = decode_uint16(&p_bytes[offset + i * 2]);
+			if (c == 0) {
+				break;
+			}
+			str += String::chr(c);
+		}
+		return str;
+	}
+}
+
+void EditorExportPlatformAndroid::_fix_resources(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &r_manifest) {
+	const int UTF8_FLAG = 0x00000100;
+
+	uint32_t string_block_len = decode_uint32(&r_manifest[16]);
+	uint32_t string_count = decode_uint32(&r_manifest[20]);
+	uint32_t string_flags = decode_uint32(&r_manifest[28]);
+	const uint32_t string_table_begins = 40;
+
+	Vector<String> string_table;
+
+	String package_name = p_preset->get("package/name");
+
+	for (uint32_t i = 0; i < string_count; i++) {
+		uint32_t offset = decode_uint32(&r_manifest[string_table_begins + i * 4]);
+		offset += string_table_begins + string_count * 4;
+
+		String str = _parse_string(&r_manifest[offset], string_flags & UTF8_FLAG);
+
+		if (str.begins_with("godot-project-name")) {
+			if (str == "godot-project-name") {
+				//project name
+				str = get_project_name(package_name);
+
+			} else {
+				String lang = str.substr(str.rfind("-") + 1, str.length()).replace("-", "_");
+				String prop = "application/config/name_" + lang;
+				if (ProjectSettings::get_singleton()->has_setting(prop)) {
+					str = ProjectSettings::get_singleton()->get(prop);
+				} else {
+					str = get_project_name(package_name);
+				}
+			}
+		}
+
+		string_table.push_back(str);
+	}
+
+	//write a new string table, but use 16 bits
+	Vector<uint8_t> ret;
+	ret.resize(string_table_begins + string_table.size() * 4);
+
+	for (uint32_t i = 0; i < string_table_begins; i++) {
+		ret.write[i] = r_manifest[i];
+	}
+
+	int ofs = 0;
+	for (int i = 0; i < string_table.size(); i++) {
+		encode_uint32(ofs, &ret.write[string_table_begins + i * 4]);
+		ofs += string_table[i].length() * 2 + 2 + 2;
+	}
+
+	ret.resize(ret.size() + ofs);
+	uint8_t *chars = &ret.write[ret.size() - ofs];
+	for (int i = 0; i < string_table.size(); i++) {
+		String s = string_table[i];
+		encode_uint16(s.length(), chars);
+		chars += 2;
+		for (int j = 0; j < s.length(); j++) {
+			encode_uint16(s[j], chars);
+			chars += 2;
+		}
+		encode_uint16(0, chars);
+		chars += 2;
+	}
+
+	//pad
+	while (ret.size() % 4) {
+		ret.push_back(0);
+	}
+
+	//change flags to not use utf8
+	encode_uint32(string_flags & ~0x100, &ret.write[28]);
+	//change length
+	encode_uint32(ret.size() - 12, &ret.write[16]);
+	//append the rest...
+	int rest_from = 12 + string_block_len;
+	int rest_to = ret.size();
+	int rest_len = (r_manifest.size() - rest_from);
+	ret.resize(ret.size() + (r_manifest.size() - rest_from));
+	for (int i = 0; i < rest_len; i++) {
+		ret.write[rest_to + i] = r_manifest[rest_from + i];
+	}
+	//finally update the size
+	encode_uint32(ret.size(), &ret.write[4]);
+
+	r_manifest = ret;
+	//printf("end\n");
+}
+
+void EditorExportPlatformAndroid::_load_image_data(const Ref<Image> &p_splash_image, Vector<uint8_t> &p_data) {
+	Vector<uint8_t> png_buffer;
+	Error err = PNGDriverCommon::image_to_png(p_splash_image, png_buffer);
+	if (err == OK) {
+		p_data.resize(png_buffer.size());
+		memcpy(p_data.ptrw(), png_buffer.ptr(), p_data.size());
+	} else {
+		String err_str = String("Failed to convert splash image to png.");
+		WARN_PRINT(err_str.utf8().get_data());
+	}
+}
+
+void EditorExportPlatformAndroid::_process_launcher_icons(const String &p_file_name, const Ref<Image> &p_source_image, int dimension, Vector<uint8_t> &p_data) {
+	Ref<Image> working_image = p_source_image;
+
+	if (p_source_image->get_width() != dimension || p_source_image->get_height() != dimension) {
+		working_image = p_source_image->duplicate();
+		working_image->resize(dimension, dimension, Image::Interpolation::INTERPOLATE_LANCZOS);
+	}
+
+	Vector<uint8_t> png_buffer;
+	Error err = PNGDriverCommon::image_to_png(working_image, png_buffer);
+	if (err == OK) {
+		p_data.resize(png_buffer.size());
+		memcpy(p_data.ptrw(), png_buffer.ptr(), p_data.size());
+	} else {
+		String err_str = String("Failed to convert resized icon (") + p_file_name + ") to png.";
+		WARN_PRINT(err_str.utf8().get_data());
+	}
+}
+
+String EditorExportPlatformAndroid::load_splash_refs(Ref<Image> &splash_image, Ref<Image> &splash_bg_color_image) {
+	bool scale_splash = ProjectSettings::get_singleton()->get("application/boot_splash/fullsize");
+	bool apply_filter = ProjectSettings::get_singleton()->get("application/boot_splash/use_filter");
+	String project_splash_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
+
+	if (!project_splash_path.is_empty()) {
+		splash_image.instantiate();
+		print_verbose("Loading splash image: " + project_splash_path);
+		const Error err = ImageLoader::load_image(project_splash_path, splash_image);
+		if (err) {
+			if (OS::get_singleton()->is_stdout_verbose()) {
+				print_error("- unable to load splash image from " + project_splash_path + " (" + itos(err) + ")");
+			}
+			splash_image.unref();
+		}
+	}
+
+	if (splash_image.is_null()) {
+		// Use the default
+		print_verbose("Using default splash image.");
+		splash_image = Ref<Image>(memnew(Image(boot_splash_png)));
+	}
+
+	if (scale_splash) {
+		Size2 screen_size = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));
+		int width, height;
+		if (screen_size.width > screen_size.height) {
+			// scale horizontally
+			height = screen_size.height;
+			width = splash_image->get_width() * screen_size.height / splash_image->get_height();
+		} else {
+			// scale vertically
+			width = screen_size.width;
+			height = splash_image->get_height() * screen_size.width / splash_image->get_width();
+		}
+		splash_image->resize(width, height);
+	}
+
+	// Setup the splash bg color
+	bool bg_color_valid;
+	Color bg_color = ProjectSettings::get_singleton()->get("application/boot_splash/bg_color", &bg_color_valid);
+	if (!bg_color_valid) {
+		bg_color = boot_splash_bg_color;
+	}
+
+	print_verbose("Creating splash background color image.");
+	splash_bg_color_image.instantiate();
+	splash_bg_color_image->create(splash_image->get_width(), splash_image->get_height(), false, splash_image->get_format());
+	splash_bg_color_image->fill(bg_color);
+
+	String processed_splash_config_xml = vformat(SPLASH_CONFIG_XML_CONTENT, bool_to_string(apply_filter));
+	return processed_splash_config_xml;
+}
+
+void EditorExportPlatformAndroid::load_icon_refs(const Ref<EditorExportPreset> &p_preset, Ref<Image> &icon, Ref<Image> &foreground, Ref<Image> &background) {
+	String project_icon_path = ProjectSettings::get_singleton()->get("application/config/icon");
+
+	icon.instantiate();
+	foreground.instantiate();
+	background.instantiate();
+
+	// Regular icon: user selection -> project icon -> default.
+	String path = static_cast<String>(p_preset->get(launcher_icon_option)).strip_edges();
+	print_verbose("Loading regular icon from " + path);
+	if (path.is_empty() || ImageLoader::load_image(path, icon) != OK) {
+		print_verbose("- falling back to project icon: " + project_icon_path);
+		ImageLoader::load_image(project_icon_path, icon);
+	}
+
+	// Adaptive foreground: user selection -> regular icon (user selection -> project icon -> default).
+	path = static_cast<String>(p_preset->get(launcher_adaptive_icon_foreground_option)).strip_edges();
+	print_verbose("Loading adaptive foreground icon from " + path);
+	if (path.is_empty() || ImageLoader::load_image(path, foreground) != OK) {
+		print_verbose("- falling back to using the regular icon");
+		foreground = icon;
+	}
+
+	// Adaptive background: user selection -> default.
+	path = static_cast<String>(p_preset->get(launcher_adaptive_icon_background_option)).strip_edges();
+	if (!path.is_empty()) {
+		print_verbose("Loading adaptive background icon from " + path);
+		ImageLoader::load_image(path, background);
+	}
+}
+
+void EditorExportPlatformAndroid::store_image(const LauncherIcon launcher_icon, const Vector<uint8_t> &data) {
+	store_image(launcher_icon.export_path, data);
+}
+
+void EditorExportPlatformAndroid::store_image(const String &export_path, const Vector<uint8_t> &data) {
+	String img_path = export_path.insert(0, "res://android/build/");
+	store_file_at_path(img_path, data);
+}
+
+void EditorExportPlatformAndroid::_copy_icons_to_gradle_project(const Ref<EditorExportPreset> &p_preset,
+		const String &processed_splash_config_xml,
+		const Ref<Image> &splash_image,
+		const Ref<Image> &splash_bg_color_image,
+		const Ref<Image> &main_image,
+		const Ref<Image> &foreground,
+		const Ref<Image> &background) {
+	// Store the splash configuration
+	if (!processed_splash_config_xml.is_empty()) {
+		print_verbose("Storing processed splash configuration: " + String("\n") + processed_splash_config_xml);
+		store_string_at_path(SPLASH_CONFIG_PATH, processed_splash_config_xml);
+	}
+
+	// Store the splash image
+	if (splash_image.is_valid() && !splash_image->is_empty()) {
+		print_verbose("Storing splash image in " + String(SPLASH_IMAGE_EXPORT_PATH));
+		Vector<uint8_t> data;
+		_load_image_data(splash_image, data);
+		store_image(SPLASH_IMAGE_EXPORT_PATH, data);
+	}
+
+	// Store the splash bg color image
+	if (splash_bg_color_image.is_valid() && !splash_bg_color_image->is_empty()) {
+		print_verbose("Storing splash background image in " + String(SPLASH_BG_COLOR_PATH));
+		Vector<uint8_t> data;
+		_load_image_data(splash_bg_color_image, data);
+		store_image(SPLASH_BG_COLOR_PATH, data);
+	}
+
+	// Prepare images to be resized for the icons. If some image ends up being uninitialized,
+	// the default image from the export template will be used.
+
+	for (int i = 0; i < icon_densities_count; ++i) {
+		if (main_image.is_valid() && !main_image->is_empty()) {
+			print_verbose("Processing launcher icon for dimension " + itos(launcher_icons[i].dimensions) + " into " + launcher_icons[i].export_path);
+			Vector<uint8_t> data;
+			_process_launcher_icons(launcher_icons[i].export_path, main_image, launcher_icons[i].dimensions, data);
+			store_image(launcher_icons[i], data);
+		}
+
+		if (foreground.is_valid() && !foreground->is_empty()) {
+			print_verbose("Processing launcher adaptive icon foreground for dimension " + itos(launcher_adaptive_icon_foregrounds[i].dimensions) + " into " + launcher_adaptive_icon_foregrounds[i].export_path);
+			Vector<uint8_t> data;
+			_process_launcher_icons(launcher_adaptive_icon_foregrounds[i].export_path, foreground,
+					launcher_adaptive_icon_foregrounds[i].dimensions, data);
+			store_image(launcher_adaptive_icon_foregrounds[i], data);
+		}
+
+		if (background.is_valid() && !background->is_empty()) {
+			print_verbose("Processing launcher adaptive icon background for dimension " + itos(launcher_adaptive_icon_backgrounds[i].dimensions) + " into " + launcher_adaptive_icon_backgrounds[i].export_path);
+			Vector<uint8_t> data;
+			_process_launcher_icons(launcher_adaptive_icon_backgrounds[i].export_path, background,
+					launcher_adaptive_icon_backgrounds[i].dimensions, data);
+			store_image(launcher_adaptive_icon_backgrounds[i], data);
+		}
+	}
+}
+
+Vector<String> EditorExportPlatformAndroid::get_enabled_abis(const Ref<EditorExportPreset> &p_preset) {
+	Vector<String> abis = get_abis();
+	Vector<String> enabled_abis;
+	for (int i = 0; i < abis.size(); ++i) {
+		bool is_enabled = p_preset->get("architectures/" + abis[i]);
+		if (is_enabled) {
+			enabled_abis.push_back(abis[i]);
+		}
+	}
+	return enabled_abis;
+}
+
+void EditorExportPlatformAndroid::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
+	String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
+	if (driver == "GLES2") {
+		r_features->push_back("etc");
+	}
+	// FIXME: Review what texture formats are used for Vulkan.
+	if (driver == "Vulkan") {
+		r_features->push_back("etc2");
+	}
+
+	Vector<String> abis = get_enabled_abis(p_preset);
+	for (int i = 0; i < abis.size(); ++i) {
+		r_features->push_back(abis[i]);
+	}
+}
+
+void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_options) {
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.apk"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.apk"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "custom_template/use_custom_build"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "custom_template/export_format", PROPERTY_HINT_ENUM, "Export APK,Export AAB"), EXPORT_FORMAT_APK));
+
+	Vector<PluginConfigAndroid> plugins_configs = get_plugins();
+	for (int i = 0; i < plugins_configs.size(); i++) {
+		print_verbose("Found Android plugin " + plugins_configs[i].name);
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "plugins/" + plugins_configs[i].name), false));
+	}
+	plugins_changed.clear();
+
+	Vector<String> abis = get_abis();
+	for (int i = 0; i < abis.size(); ++i) {
+		String abi = abis[i];
+		bool is_default = (abi == "armeabi-v7a" || abi == "arm64-v8a");
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + abi), is_default));
+	}
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/debug", PROPERTY_HINT_GLOBAL_FILE, "*.keystore,*.jks"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/debug_user"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/debug_password"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release", PROPERTY_HINT_GLOBAL_FILE, "*.keystore,*.jks"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release_user"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "keystore/release_password"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "one_click_deploy/clear_previous_install"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/code", PROPERTY_HINT_RANGE, "1,4096,1,or_greater"), 1));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "version/name"), "1.0"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/unique_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "ext.domain.name"), "org.godotengine.$genname"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name [default if blank]"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/classify_as_game"), true));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_icon_option, PROPERTY_HINT_FILE, "*.png"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_adaptive_icon_foreground_option, PROPERTY_HINT_FILE, "*.png"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_adaptive_icon_background_option, PROPERTY_HINT_FILE, "*.png"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "graphics/32_bits_framebuffer"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "graphics/opengl_debug"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/xr_mode", PROPERTY_HINT_ENUM, "Regular,Oculus Mobile VR"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/hand_tracking", PROPERTY_HINT_ENUM, "None,Optional,Required"), 0));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/immersive_mode"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_small"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_xlarge"), true));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data_backup/allow"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "command_line/extra_args"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "apk_expansion/enable"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "apk_expansion/SALT"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "apk_expansion/public_key", PROPERTY_HINT_MULTILINE_TEXT), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "permissions/custom_permissions"), PackedStringArray()));
+
+	const char **perms = android_perms;
+	while (*perms) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "permissions/" + String(*perms).to_lower()), false));
+		perms++;
+	}
+}
+
+String EditorExportPlatformAndroid::get_name() const {
+	return "Android";
+}
+
+String EditorExportPlatformAndroid::get_os_name() const {
+	return "Android";
+}
+
+Ref<Texture2D> EditorExportPlatformAndroid::get_logo() const {
+	return logo;
+}
+
+bool EditorExportPlatformAndroid::should_update_export_options() {
+	bool export_options_changed = plugins_changed.is_set();
+	if (export_options_changed) {
+		// don't clear unless we're reporting true, to avoid race
+		plugins_changed.clear();
+	}
+	return export_options_changed;
+}
+
+bool EditorExportPlatformAndroid::poll_export() {
+	bool dc = devices_changed.is_set();
+	if (dc) {
+		// don't clear unless we're reporting true, to avoid race
+		devices_changed.clear();
+	}
+	return dc;
+}
+
+int EditorExportPlatformAndroid::get_options_count() const {
+	MutexLock lock(device_lock);
+	return devices.size();
+}
+
+String EditorExportPlatformAndroid::get_options_tooltip() const {
+	return TTR("Select device from the list");
+}
+
+String EditorExportPlatformAndroid::get_option_label(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, devices.size(), "");
+	MutexLock lock(device_lock);
+	return devices[p_index].name;
+}
+
+String EditorExportPlatformAndroid::get_option_tooltip(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, devices.size(), "");
+	MutexLock lock(device_lock);
+	String s = devices[p_index].description;
+	if (devices.size() == 1) {
+		// Tooltip will be:
+		// Name
+		// Description
+		s = devices[p_index].name + "\n\n" + s;
+	}
+	return s;
+}
+
+Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) {
+	ERR_FAIL_INDEX_V(p_device, devices.size(), ERR_INVALID_PARAMETER);
+
+	String can_export_error;
+	bool can_export_missing_templates;
+	if (!can_export(p_preset, can_export_error, can_export_missing_templates)) {
+		EditorNode::add_io_error(can_export_error);
+		return ERR_UNCONFIGURED;
+	}
+
+	MutexLock lock(device_lock);
+
+	EditorProgress ep("run", vformat(TTR("Running on %s"), devices[p_device].name), 3);
+
+	String adb = get_adb_path();
+
+	// Export_temp APK.
+	if (ep.step(TTR("Exporting APK..."), 0)) {
+		return ERR_SKIP;
+	}
+
+	const bool use_remote = (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG) || (p_debug_flags & DEBUG_FLAG_DUMB_CLIENT);
+	const bool use_reverse = devices[p_device].api_level >= 21;
+
+	if (use_reverse) {
+		p_debug_flags |= DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST;
+	}
+
+	String tmp_export_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpexport." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
+
+#define CLEANUP_AND_RETURN(m_err)                         \
+	{                                                     \
+		DirAccess::remove_file_or_error(tmp_export_path); \
+		return m_err;                                     \
+	}
+
+	// Export to temporary APK before sending to device.
+	Error err = export_project_helper(p_preset, true, tmp_export_path, EXPORT_FORMAT_APK, true, p_debug_flags);
+
+	if (err != OK) {
+		CLEANUP_AND_RETURN(err);
+	}
+
+	List<String> args;
+	int rv;
+	String output;
+
+	bool remove_prev = p_preset->get("one_click_deploy/clear_previous_install");
+	String version_name = p_preset->get("version/name");
+	String package_name = p_preset->get("package/unique_name");
+
+	if (remove_prev) {
+		if (ep.step(TTR("Uninstalling..."), 1)) {
+			CLEANUP_AND_RETURN(ERR_SKIP);
+		}
+
+		print_line("Uninstalling previous version: " + devices[p_device].name);
+
+		args.push_back("-s");
+		args.push_back(devices[p_device].id);
+		args.push_back("uninstall");
+		args.push_back(get_package_name(package_name));
+
+		output.clear();
+		err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
+		print_verbose(output);
+	}
+
+	print_line("Installing to device (please wait...): " + devices[p_device].name);
+	if (ep.step(TTR("Installing to device, please wait..."), 2)) {
+		CLEANUP_AND_RETURN(ERR_SKIP);
+	}
+
+	args.clear();
+	args.push_back("-s");
+	args.push_back(devices[p_device].id);
+	args.push_back("install");
+	args.push_back("-r");
+	args.push_back(tmp_export_path);
+
+	output.clear();
+	err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
+	print_verbose(output);
+	if (err || rv != 0) {
+		EditorNode::add_io_error(vformat(TTR("Could not install to device: %s"), output));
+		CLEANUP_AND_RETURN(ERR_CANT_CREATE);
+	}
+
+	if (use_remote) {
+		if (use_reverse) {
+			static const char *const msg = "--- Device API >= 21; debugging over USB ---";
+			EditorNode::get_singleton()->get_log()->add_message(msg, EditorLog::MSG_TYPE_EDITOR);
+			print_line(String(msg).to_upper());
+
+			args.clear();
+			args.push_back("-s");
+			args.push_back(devices[p_device].id);
+			args.push_back("reverse");
+			args.push_back("--remove-all");
+			output.clear();
+			OS::get_singleton()->execute(adb, args, &output, &rv, true);
+			print_verbose(output);
+
+			if (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG) {
+				int dbg_port = EditorSettings::get_singleton()->get("network/debug/remote_port");
+				args.clear();
+				args.push_back("-s");
+				args.push_back(devices[p_device].id);
+				args.push_back("reverse");
+				args.push_back("tcp:" + itos(dbg_port));
+				args.push_back("tcp:" + itos(dbg_port));
+
+				output.clear();
+				OS::get_singleton()->execute(adb, args, &output, &rv, true);
+				print_verbose(output);
+				print_line("Reverse result: " + itos(rv));
+			}
+
+			if (p_debug_flags & DEBUG_FLAG_DUMB_CLIENT) {
+				int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port");
+
+				args.clear();
+				args.push_back("-s");
+				args.push_back(devices[p_device].id);
+				args.push_back("reverse");
+				args.push_back("tcp:" + itos(fs_port));
+				args.push_back("tcp:" + itos(fs_port));
+
+				output.clear();
+				err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
+				print_verbose(output);
+				print_line("Reverse result2: " + itos(rv));
+			}
+		} else {
+			static const char *const msg = "--- Device API < 21; debugging over Wi-Fi ---";
+			EditorNode::get_singleton()->get_log()->add_message(msg, EditorLog::MSG_TYPE_EDITOR);
+			print_line(String(msg).to_upper());
+		}
+	}
+
+	if (ep.step(TTR("Running on device..."), 3)) {
+		CLEANUP_AND_RETURN(ERR_SKIP);
+	}
+	args.clear();
+	args.push_back("-s");
+	args.push_back(devices[p_device].id);
+	args.push_back("shell");
+	args.push_back("am");
+	args.push_back("start");
+	if ((bool)EditorSettings::get_singleton()->get("export/android/force_system_user") && devices[p_device].api_level >= 17) { // Multi-user introduced in Android 17
+		args.push_back("--user");
+		args.push_back("0");
+	}
+	args.push_back("-a");
+	args.push_back("android.intent.action.MAIN");
+	args.push_back("-n");
+	args.push_back(get_package_name(package_name) + "/com.godot.game.GodotApp");
+
+	output.clear();
+	err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
+	print_verbose(output);
+	if (err || rv != 0) {
+		EditorNode::add_io_error(TTR("Could not execute on device."));
+		CLEANUP_AND_RETURN(ERR_CANT_CREATE);
+	}
+
+	CLEANUP_AND_RETURN(OK);
+#undef CLEANUP_AND_RETURN
+}
+
+Ref<Texture2D> EditorExportPlatformAndroid::get_run_icon() const {
+	return run_icon;
+}
+
+String EditorExportPlatformAndroid::get_adb_path() {
+	String exe_ext = "";
+	if (OS::get_singleton()->get_name() == "Windows") {
+		exe_ext = ".exe";
+	}
+	String sdk_path = EditorSettings::get_singleton()->get("export/android/android_sdk_path");
+	return sdk_path.plus_file("platform-tools/adb" + exe_ext);
+}
+
+String EditorExportPlatformAndroid::get_apksigner_path() {
+	String exe_ext = "";
+	if (OS::get_singleton()->get_name() == "Windows") {
+		exe_ext = ".bat";
+	}
+	String apksigner_command_name = "apksigner" + exe_ext;
+	String sdk_path = EditorSettings::get_singleton()->get("export/android/android_sdk_path");
+	String apksigner_path = "";
+
+	Error errn;
+	String build_tools_dir = sdk_path.plus_file("build-tools");
+	DirAccessRef da = DirAccess::open(build_tools_dir, &errn);
+	if (errn != OK) {
+		print_error("Unable to open Android 'build-tools' directory.");
+		return apksigner_path;
+	}
+
+	// There are additional versions directories we need to go through.
+	da->list_dir_begin();
+	String sub_dir = da->get_next();
+	while (!sub_dir.is_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(apksigner_command_name);
+			if (FileAccess::exists(tool_path)) {
+				apksigner_path = tool_path;
+				break;
+			}
+		}
+		sub_dir = da->get_next();
+	}
+	da->list_dir_end();
+
+	if (apksigner_path.is_empty()) {
+		EditorNode::get_singleton()->show_warning(TTR("Unable to find the 'apksigner' tool."));
+	}
+
+	return apksigner_path;
+}
+
+bool EditorExportPlatformAndroid::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+	String err;
+	bool valid = false;
+
+	// Look for export templates (first official, and if defined custom templates).
+
+	if (!bool(p_preset->get("custom_template/use_custom_build"))) {
+		String template_err;
+		bool dvalid = false;
+		bool rvalid = false;
+		bool has_export_templates = false;
+
+		if (p_preset->get("custom_template/debug") != "") {
+			dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
+			if (!dvalid) {
+				template_err += TTR("Custom debug template not found.") + "\n";
+			}
+		} else {
+			has_export_templates |= exists_export_template("android_debug.apk", &template_err);
+		}
+
+		if (p_preset->get("custom_template/release") != "") {
+			rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
+			if (!rvalid) {
+				template_err += TTR("Custom release template not found.") + "\n";
+			}
+		} else {
+			has_export_templates |= exists_export_template("android_release.apk", &template_err);
+		}
+
+		r_missing_templates = !has_export_templates;
+		valid = dvalid || rvalid || has_export_templates;
+		if (!valid) {
+			err += template_err;
+		}
+	} else {
+		bool installed_android_build_template = FileAccess::exists("res://android/build/build.gradle");
+		if (!installed_android_build_template) {
+			r_missing_templates = !exists_export_template("android_source.zip", &err);
+			err += TTR("Android build template not installed in the project. Install it from the Project menu.") + "\n";
+		} else {
+			r_missing_templates = false;
+		}
+
+		valid = installed_android_build_template && !r_missing_templates;
+	}
+
+	// Validate the rest of the configuration.
+
+	String dk = p_preset->get("keystore/debug");
+	String dk_user = p_preset->get("keystore/debug_user");
+	String dk_password = p_preset->get("keystore/debug_password");
+
+	if ((dk.is_empty() || dk_user.is_empty() || dk_password.is_empty()) && (!dk.is_empty() || !dk_user.is_empty() || !dk_password.is_empty())) {
+		valid = false;
+		err += TTR("Either Debug Keystore, Debug User AND Debug Password settings must be configured OR none of them.") + "\n";
+	}
+
+	if (!FileAccess::exists(dk)) {
+		dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
+		if (!FileAccess::exists(dk)) {
+			valid = false;
+			err += TTR("Debug keystore not configured in the Editor Settings nor in the preset.") + "\n";
+		}
+	}
+
+	String rk = p_preset->get("keystore/release");
+	String rk_user = p_preset->get("keystore/release_user");
+	String rk_password = p_preset->get("keystore/release_password");
+
+	if ((rk.is_empty() || rk_user.is_empty() || rk_password.is_empty()) && (!rk.is_empty() || !rk_user.is_empty() || !rk_password.is_empty())) {
+		valid = false;
+		err += TTR("Either Release Keystore, Release User AND Release Password settings must be configured OR none of them.") + "\n";
+	}
+
+	if (!rk.is_empty() && !FileAccess::exists(rk)) {
+		valid = false;
+		err += TTR("Release keystore incorrectly configured in the export preset.") + "\n";
+	}
+
+	String sdk_path = EditorSettings::get_singleton()->get("export/android/android_sdk_path");
+	if (sdk_path == "") {
+		err += TTR("A valid Android SDK path is required in Editor Settings.") + "\n";
+		valid = false;
+	} else {
+		Error errn;
+		// Check for the platform-tools directory.
+		DirAccessRef da = DirAccess::open(sdk_path.plus_file("platform-tools"), &errn);
+		if (errn != OK) {
+			err += TTR("Invalid Android SDK path in Editor Settings.");
+			err += TTR("Missing 'platform-tools' directory!");
+			err += "\n";
+			valid = false;
+		}
+
+		// Validate that adb is available
+		String adb_path = get_adb_path();
+		if (!FileAccess::exists(adb_path)) {
+			err += TTR("Unable to find Android SDK platform-tools' adb command.");
+			err += TTR("Please check in the Android SDK directory specified in Editor Settings.");
+			err += "\n";
+			valid = false;
+		}
+
+		// Check for the build-tools directory.
+		DirAccessRef build_tools_da = DirAccess::open(sdk_path.plus_file("build-tools"), &errn);
+		if (errn != OK) {
+			err += TTR("Invalid Android SDK path in Editor Settings.");
+			err += TTR("Missing 'build-tools' directory!");
+			err += "\n";
+			valid = false;
+		}
+
+		// Validate that apksigner is available
+		String apksigner_path = get_apksigner_path();
+		if (!FileAccess::exists(apksigner_path)) {
+			err += TTR("Unable to find Android SDK build-tools' apksigner command.");
+			err += TTR("Please check in the Android SDK directory specified in Editor Settings.");
+			err += "\n";
+			valid = false;
+		}
+	}
+
+	bool apk_expansion = p_preset->get("apk_expansion/enable");
+
+	if (apk_expansion) {
+		String apk_expansion_pkey = p_preset->get("apk_expansion/public_key");
+
+		if (apk_expansion_pkey == "") {
+			valid = false;
+
+			err += TTR("Invalid public key for APK expansion.") + "\n";
+		}
+	}
+
+	String pn = p_preset->get("package/unique_name");
+	String pn_err;
+
+	if (!is_package_name_valid(get_package_name(pn), &pn_err)) {
+		valid = false;
+		err += TTR("Invalid package name:") + " " + pn_err + "\n";
+	}
+
+	String etc_error = test_etc2();
+	if (etc_error != String()) {
+		valid = false;
+		err += etc_error;
+	}
+
+	// Ensure that `Use Custom Build` is enabled if a plugin is selected.
+	String enabled_plugins_names = PluginConfigAndroid::get_plugins_names(get_enabled_plugins(p_preset));
+	bool custom_build_enabled = p_preset->get("custom_template/use_custom_build");
+	if (!enabled_plugins_names.is_empty() && !custom_build_enabled) {
+		valid = false;
+		err += TTR("\"Use Custom Build\" must be enabled to use the plugins.");
+		err += "\n";
+	}
+
+	// Validate the Xr features are properly populated
+	int xr_mode_index = p_preset->get("xr_features/xr_mode");
+	int hand_tracking = p_preset->get("xr_features/hand_tracking");
+	if (xr_mode_index != /* XRMode.OVR*/ 1) {
+		if (hand_tracking > 0) {
+			valid = false;
+			err += TTR("\"Hand Tracking\" is only valid when \"Xr Mode\" is \"Oculus Mobile VR\".");
+			err += "\n";
+		}
+	}
+
+	if (int(p_preset->get("custom_template/export_format")) == EXPORT_FORMAT_AAB &&
+			!bool(p_preset->get("custom_template/use_custom_build"))) {
+		valid = false;
+		err += TTR("\"Export AAB\" is only valid when \"Use Custom Build\" is enabled.");
+		err += "\n";
+	}
+
+	r_error = err;
+	return valid;
+}
+
+List<String> EditorExportPlatformAndroid::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {
+	List<String> list;
+	list.push_back("apk");
+	list.push_back("aab");
+	return list;
+}
+
+String EditorExportPlatformAndroid::get_apk_expansion_fullpath(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
+	int version_code = p_preset->get("version/code");
+	String package_name = p_preset->get("package/unique_name");
+	String apk_file_name = "main." + itos(version_code) + "." + get_package_name(package_name) + ".obb";
+	String fullpath = p_path.get_base_dir().plus_file(apk_file_name);
+	return fullpath;
+}
+
+Error EditorExportPlatformAndroid::save_apk_expansion_file(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
+	String fullpath = get_apk_expansion_fullpath(p_preset, p_path);
+	Error err = save_pack(p_preset, fullpath);
+	return err;
+}
+
+void EditorExportPlatformAndroid::get_command_line_flags(const Ref<EditorExportPreset> &p_preset, const String &p_path, int p_flags, Vector<uint8_t> &r_command_line_flags) {
+	String cmdline = p_preset->get("command_line/extra_args");
+	Vector<String> command_line_strings = cmdline.strip_edges().split(" ");
+	for (int i = 0; i < command_line_strings.size(); i++) {
+		if (command_line_strings[i].strip_edges().length() == 0) {
+			command_line_strings.remove(i);
+			i--;
+		}
+	}
+
+	gen_export_flags(command_line_strings, p_flags);
+
+	bool apk_expansion = p_preset->get("apk_expansion/enable");
+	if (apk_expansion) {
+		String fullpath = get_apk_expansion_fullpath(p_preset, p_path);
+		String apk_expansion_public_key = p_preset->get("apk_expansion/public_key");
+
+		command_line_strings.push_back("--use_apk_expansion");
+		command_line_strings.push_back("--apk_expansion_md5");
+		command_line_strings.push_back(FileAccess::get_md5(fullpath));
+		command_line_strings.push_back("--apk_expansion_key");
+		command_line_strings.push_back(apk_expansion_public_key.strip_edges());
+	}
+
+	int xr_mode_index = p_preset->get("xr_features/xr_mode");
+	if (xr_mode_index == 1) {
+		command_line_strings.push_back("--xr_mode_ovr");
+	} else { // XRMode.REGULAR is the default.
+		command_line_strings.push_back("--xr_mode_regular");
+	}
+
+	bool use_32_bit_framebuffer = p_preset->get("graphics/32_bits_framebuffer");
+	if (use_32_bit_framebuffer) {
+		command_line_strings.push_back("--use_depth_32");
+	}
+
+	bool immersive = p_preset->get("screen/immersive_mode");
+	if (immersive) {
+		command_line_strings.push_back("--use_immersive");
+	}
+
+	bool debug_opengl = p_preset->get("graphics/opengl_debug");
+	if (debug_opengl) {
+		command_line_strings.push_back("--debug_opengl");
+	}
+
+	if (command_line_strings.size()) {
+		r_command_line_flags.resize(4);
+		encode_uint32(command_line_strings.size(), &r_command_line_flags.write[0]);
+		for (int i = 0; i < command_line_strings.size(); i++) {
+			print_line(itos(i) + " param: " + command_line_strings[i]);
+			CharString command_line_argument = command_line_strings[i].utf8();
+			int base = r_command_line_flags.size();
+			int length = command_line_argument.length();
+			if (length == 0) {
+				continue;
+			}
+			r_command_line_flags.resize(base + 4 + length);
+			encode_uint32(length, &r_command_line_flags.write[base]);
+			memcpy(&r_command_line_flags.write[base + 4], command_line_argument.ptr(), length);
+		}
+	}
+}
+
+Error EditorExportPlatformAndroid::sign_apk(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &export_path, EditorProgress &ep) {
+	int export_format = int(p_preset->get("custom_template/export_format"));
+	String export_label = export_format == EXPORT_FORMAT_AAB ? "AAB" : "APK";
+	String release_keystore = p_preset->get("keystore/release");
+	String release_username = p_preset->get("keystore/release_user");
+	String release_password = p_preset->get("keystore/release_password");
+
+	String apksigner = get_apksigner_path();
+	print_verbose("Starting signing of the " + export_label + " binary using " + apksigner);
+	if (!FileAccess::exists(apksigner)) {
+		EditorNode::add_io_error(vformat(TTR("'apksigner' could not be found.\nPlease check the command is available in the Android SDK build-tools directory.\nThe resulting %s is unsigned."), export_label));
+		return OK;
+	}
+
+	String keystore;
+	String password;
+	String user;
+	if (p_debug) {
+		keystore = p_preset->get("keystore/debug");
+		password = p_preset->get("keystore/debug_password");
+		user = p_preset->get("keystore/debug_user");
+
+		if (keystore.is_empty()) {
+			keystore = EditorSettings::get_singleton()->get("export/android/debug_keystore");
+			password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass");
+			user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user");
+		}
+
+		if (ep.step(vformat(TTR("Signing debug %s..."), export_label), 104)) {
+			return ERR_SKIP;
+		}
+
+	} else {
+		keystore = release_keystore;
+		password = release_password;
+		user = release_username;
+
+		if (ep.step(vformat(TTR("Signing release %s..."), export_label), 104)) {
+			return ERR_SKIP;
+		}
+	}
+
+	if (!FileAccess::exists(keystore)) {
+		EditorNode::add_io_error(TTR("Could not find keystore, unable to export."));
+		return ERR_FILE_CANT_OPEN;
+	}
+
+	String output;
+	List<String> args;
+	args.push_back("sign");
+	args.push_back("--verbose");
+	args.push_back("--ks");
+	args.push_back(keystore);
+	args.push_back("--ks-pass");
+	args.push_back("pass:" + password);
+	args.push_back("--ks-key-alias");
+	args.push_back(user);
+	args.push_back(export_path);
+	if (p_debug) {
+		// We only print verbose logs for debug builds to avoid leaking release keystore credentials.
+		print_verbose("Signing debug binary using: " + String("\n") + apksigner + " " + join_list(args, String(" ")));
+	}
+	int retval;
+	output.clear();
+	OS::get_singleton()->execute(apksigner, args, &output, &retval, true);
+	print_verbose(output);
+	if (retval) {
+		EditorNode::add_io_error(vformat(TTR("'apksigner' returned with error #%d"), retval));
+		return ERR_CANT_CREATE;
+	}
+
+	if (ep.step(vformat(TTR("Verifying %s..."), export_label), 105)) {
+		return ERR_SKIP;
+	}
+
+	args.clear();
+	args.push_back("verify");
+	args.push_back("--verbose");
+	args.push_back(export_path);
+	if (p_debug) {
+		print_verbose("Verifying signed build using: " + String("\n") + apksigner + " " + join_list(args, String(" ")));
+	}
+
+	output.clear();
+	OS::get_singleton()->execute(apksigner, args, &output, &retval, true);
+	print_verbose(output);
+	if (retval) {
+		EditorNode::add_io_error(vformat(TTR("'apksigner' verification of %s failed."), export_label));
+		return ERR_CANT_CREATE;
+	}
+
+	print_verbose("Successfully completed signing build.");
+	return OK;
+}
+
+void EditorExportPlatformAndroid::_clear_assets_directory() {
+	DirAccessRef da_res = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	if (da_res->dir_exists("res://android/build/assets")) {
+		print_verbose("Clearing assets directory..");
+		DirAccessRef da_assets = DirAccess::open("res://android/build/assets");
+		da_assets->erase_contents_recursive();
+		da_res->remove("res://android/build/assets");
+	}
+}
+
+void EditorExportPlatformAndroid::_remove_copied_libs() {
+	print_verbose("Removing previously installed libraries...");
+	Error error;
+	String libs_json = FileAccess::get_file_as_string(GDNATIVE_LIBS_PATH, &error);
+	if (error || libs_json.is_empty()) {
+		print_verbose("No previously installed libraries found");
+		return;
+	}
+
+	JSON json;
+	error = json.parse(libs_json);
+	ERR_FAIL_COND_MSG(error, "Error parsing \"" + libs_json + "\" on line " + itos(json.get_error_line()) + ": " + json.get_error_message());
+
+	Vector<String> libs = json.get_data();
+	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	for (int i = 0; i < libs.size(); i++) {
+		print_verbose("Removing previously installed library " + libs[i]);
+		da->remove(libs[i]);
+	}
+	da->remove(GDNATIVE_LIBS_PATH);
+}
+
+String EditorExportPlatformAndroid::join_list(List<String> parts, const String &separator) const {
+	String ret;
+	for (int i = 0; i < parts.size(); ++i) {
+		if (i > 0) {
+			ret += separator;
+		}
+		ret += parts[i];
+	}
+	return ret;
+}
+
+Error EditorExportPlatformAndroid::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+	int export_format = int(p_preset->get("custom_template/export_format"));
+	bool should_sign = p_preset->get("package/signed");
+	return export_project_helper(p_preset, p_debug, p_path, export_format, should_sign, p_flags);
+}
+
+Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int export_format, bool should_sign, int p_flags) {
+	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
+
+	String src_apk;
+	Error err;
+
+	EditorProgress ep("export", TTR("Exporting for Android"), 105, true);
+
+	bool use_custom_build = bool(p_preset->get("custom_template/use_custom_build"));
+	bool p_give_internet = p_flags & (DEBUG_FLAG_DUMB_CLIENT | DEBUG_FLAG_REMOTE_DEBUG);
+	bool apk_expansion = p_preset->get("apk_expansion/enable");
+	Vector<String> enabled_abis = get_enabled_abis(p_preset);
+
+	print_verbose("Exporting for Android...");
+	print_verbose("- debug build: " + bool_to_string(p_debug));
+	print_verbose("- export path: " + p_path);
+	print_verbose("- export format: " + itos(export_format));
+	print_verbose("- sign build: " + bool_to_string(should_sign));
+	print_verbose("- custom build enabled: " + bool_to_string(use_custom_build));
+	print_verbose("- apk expansion enabled: " + bool_to_string(apk_expansion));
+	print_verbose("- enabled abis: " + String(",").join(enabled_abis));
+	print_verbose("- export filter: " + itos(p_preset->get_export_filter()));
+	print_verbose("- include filter: " + p_preset->get_include_filter());
+	print_verbose("- exclude filter: " + p_preset->get_exclude_filter());
+
+	Ref<Image> splash_image;
+	Ref<Image> splash_bg_color_image;
+	String processed_splash_config_xml = load_splash_refs(splash_image, splash_bg_color_image);
+
+	Ref<Image> main_image;
+	Ref<Image> foreground;
+	Ref<Image> background;
+
+	load_icon_refs(p_preset, main_image, foreground, background);
+
+	Vector<uint8_t> command_line_flags;
+	// Write command line flags into the command_line_flags variable.
+	get_command_line_flags(p_preset, p_path, p_flags, command_line_flags);
+
+	if (export_format == EXPORT_FORMAT_AAB) {
+		if (!p_path.ends_with(".aab")) {
+			EditorNode::get_singleton()->show_warning(TTR("Invalid filename! Android App Bundle requires the *.aab extension."));
+			return ERR_UNCONFIGURED;
+		}
+		if (apk_expansion) {
+			EditorNode::get_singleton()->show_warning(TTR("APK Expansion not compatible with Android App Bundle."));
+			return ERR_UNCONFIGURED;
+		}
+	}
+	if (export_format == EXPORT_FORMAT_APK && !p_path.ends_with(".apk")) {
+		EditorNode::get_singleton()->show_warning(
+				TTR("Invalid filename! Android APK requires the *.apk extension."));
+		return ERR_UNCONFIGURED;
+	}
+	if (export_format > EXPORT_FORMAT_AAB || export_format < EXPORT_FORMAT_APK) {
+		EditorNode::add_io_error(TTR("Unsupported export format!\n"));
+		return ERR_UNCONFIGURED; //TODO: is this the right error?
+	}
+
+	if (use_custom_build) {
+		print_verbose("Starting custom build..");
+		//test that installed build version is alright
+		{
+			print_verbose("Checking build version..");
+			FileAccessRef f = FileAccess::open("res://android/.build_version", FileAccess::READ);
+			if (!f) {
+				EditorNode::get_singleton()->show_warning(TTR("Trying to build from a custom built template, but no version info for it exists. Please reinstall from the 'Project' menu."));
+				return ERR_UNCONFIGURED;
+			}
+			String version = f->get_line().strip_edges();
+			print_verbose("- build version: " + version);
+			f->close();
+			if (version != VERSION_FULL_CONFIG) {
+				EditorNode::get_singleton()->show_warning(vformat(TTR("Android build version mismatch:\n   Template installed: %s\n   Godot Version: %s\nPlease reinstall Android build template from 'Project' menu."), version, VERSION_FULL_CONFIG));
+				return ERR_UNCONFIGURED;
+			}
+		}
+		String sdk_path = EDITOR_GET("export/android/android_sdk_path");
+		ERR_FAIL_COND_V_MSG(sdk_path.is_empty(), ERR_UNCONFIGURED, "Android SDK path must be configured in Editor Settings at 'export/android/android_sdk_path'.");
+		print_verbose("Android sdk path: " + sdk_path);
+
+		// TODO: should we use "package/name" or "application/config/name"?
+		String project_name = get_project_name(p_preset->get("package/name"));
+		err = _create_project_name_strings_files(p_preset, project_name); //project name localization.
+		if (err != OK) {
+			EditorNode::add_io_error(TTR("Unable to overwrite res://android/build/res/*.xml files with project name"));
+		}
+		// Copies the project icon files into the appropriate Gradle project directory.
+		_copy_icons_to_gradle_project(p_preset, processed_splash_config_xml, splash_image, splash_bg_color_image, main_image, foreground, background);
+		// Write an AndroidManifest.xml file into the Gradle project directory.
+		_write_tmp_manifest(p_preset, p_give_internet, p_debug);
+
+		//stores all the project files inside the Gradle project directory. Also includes all ABIs
+		_clear_assets_directory();
+		_remove_copied_libs();
+		if (!apk_expansion) {
+			print_verbose("Exporting project files..");
+			CustomExportData user_data;
+			user_data.debug = p_debug;
+			err = export_project_files(p_preset, rename_and_store_file_in_gradle_project, &user_data, copy_gradle_so);
+			if (err != OK) {
+				EditorNode::add_io_error(TTR("Could not export project files to gradle project\n"));
+				return err;
+			}
+			if (user_data.libs.size() > 0) {
+				FileAccessRef fa = FileAccess::open(GDNATIVE_LIBS_PATH, FileAccess::WRITE);
+				JSON json;
+				fa->store_string(json.stringify(user_data.libs, "\t"));
+				fa->close();
+			}
+		} else {
+			print_verbose("Saving apk expansion file..");
+			err = save_apk_expansion_file(p_preset, p_path);
+			if (err != OK) {
+				EditorNode::add_io_error(TTR("Could not write expansion package file!"));
+				return err;
+			}
+		}
+		print_verbose("Storing command line flags..");
+		store_file_at_path("res://android/build/assets/_cl_", command_line_flags);
+
+		print_verbose("Updating ANDROID_HOME environment to " + sdk_path);
+		OS::get_singleton()->set_environment("ANDROID_HOME", sdk_path); //set and overwrite if required
+		String build_command;
+
+#ifdef WINDOWS_ENABLED
+		build_command = "gradlew.bat";
+#else
+		build_command = "gradlew";
+#endif
+
+		String build_path = ProjectSettings::get_singleton()->get_resource_path().plus_file("android/build");
+		build_command = build_path.plus_file(build_command);
+
+		String package_name = get_package_name(p_preset->get("package/unique_name"));
+		String version_code = itos(p_preset->get("version/code"));
+		String version_name = p_preset->get("version/name");
+		String enabled_abi_string = String("|").join(enabled_abis);
+		String sign_flag = should_sign ? "true" : "false";
+		String zipalign_flag = "true";
+
+		Vector<PluginConfigAndroid> enabled_plugins = get_enabled_plugins(p_preset);
+		String local_plugins_binaries = PluginConfigAndroid::get_plugins_binaries(PluginConfigAndroid::BINARY_TYPE_LOCAL, enabled_plugins);
+		String remote_plugins_binaries = PluginConfigAndroid::get_plugins_binaries(PluginConfigAndroid::BINARY_TYPE_REMOTE, enabled_plugins);
+		String custom_maven_repos = PluginConfigAndroid::get_plugins_custom_maven_repos(enabled_plugins);
+		bool clean_build_required = is_clean_build_required(enabled_plugins);
+
+		List<String> cmdline;
+		if (clean_build_required) {
+			cmdline.push_back("clean");
+		}
+
+		String build_type = p_debug ? "Debug" : "Release";
+		if (export_format == EXPORT_FORMAT_AAB) {
+			String bundle_build_command = vformat("bundle%s", build_type);
+			cmdline.push_back(bundle_build_command);
+		} else if (export_format == EXPORT_FORMAT_APK) {
+			String apk_build_command = vformat("assemble%s", build_type);
+			cmdline.push_back(apk_build_command);
+		}
+
+		cmdline.push_back("-p"); // argument to specify the start directory.
+		cmdline.push_back(build_path); // start directory.
+		cmdline.push_back("-Pexport_package_name=" + package_name); // argument to specify the package name.
+		cmdline.push_back("-Pexport_version_code=" + version_code); // argument to specify the version code.
+		cmdline.push_back("-Pexport_version_name=" + version_name); // argument to specify the version name.
+		cmdline.push_back("-Pexport_enabled_abis=" + enabled_abi_string); // argument to specify enabled ABIs.
+		cmdline.push_back("-Pplugins_local_binaries=" + local_plugins_binaries); // argument to specify the list of plugins local dependencies.
+		cmdline.push_back("-Pplugins_remote_binaries=" + remote_plugins_binaries); // argument to specify the list of plugins remote dependencies.
+		cmdline.push_back("-Pplugins_maven_repos=" + custom_maven_repos); // argument to specify the list of custom maven repos for the plugins dependencies.
+		cmdline.push_back("-Pperform_zipalign=" + zipalign_flag); // argument to specify whether the build should be zipaligned.
+		cmdline.push_back("-Pperform_signing=" + sign_flag); // argument to specify whether the build should be signed.
+		cmdline.push_back("-Pgodot_editor_version=" + String(VERSION_FULL_CONFIG));
+
+		// NOTE: The release keystore is not included in the verbose logging
+		// to avoid accidentally leaking sensitive information when sharing verbose logs for troubleshooting.
+		// Any non-sensitive additions to the command line arguments must be done above this section.
+		// Sensitive additions must be done below the logging statement.
+		print_verbose("Build Android project using gradle command: " + String("\n") + build_command + " " + join_list(cmdline, String(" ")));
+
+		if (should_sign) {
+			if (p_debug) {
+				String debug_keystore = p_preset->get("keystore/debug");
+				String debug_password = p_preset->get("keystore/debug_password");
+				String debug_user = p_preset->get("keystore/debug_user");
+
+				if (debug_keystore.is_empty()) {
+					debug_keystore = EditorSettings::get_singleton()->get("export/android/debug_keystore");
+					debug_password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass");
+					debug_user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user");
+				}
+
+				cmdline.push_back("-Pdebug_keystore_file=" + debug_keystore); // argument to specify the debug keystore file.
+				cmdline.push_back("-Pdebug_keystore_alias=" + debug_user); // argument to specify the debug keystore alias.
+				cmdline.push_back("-Pdebug_keystore_password=" + debug_password); // argument to specify the debug keystore password.
+			} else {
+				// Pass the release keystore info as well
+				String release_keystore = p_preset->get("keystore/release");
+				String release_username = p_preset->get("keystore/release_user");
+				String release_password = p_preset->get("keystore/release_password");
+				if (!FileAccess::exists(release_keystore)) {
+					EditorNode::add_io_error(TTR("Could not find keystore, unable to export."));
+					return ERR_FILE_CANT_OPEN;
+				}
+
+				cmdline.push_back("-Prelease_keystore_file=" + release_keystore); // argument to specify the release keystore file.
+				cmdline.push_back("-Prelease_keystore_alias=" + release_username); // argument to specify the release keystore alias.
+				cmdline.push_back("-Prelease_keystore_password=" + release_password); // argument to specify the release keystore password.
+			}
+		}
+
+		int result = EditorNode::get_singleton()->execute_and_show_output(TTR("Building Android Project (gradle)"), build_command, cmdline);
+		if (result != 0) {
+			EditorNode::get_singleton()->show_warning(TTR("Building of Android project failed, check output for the error.\nAlternatively visit docs.godotengine.org for Android build documentation."));
+			return ERR_CANT_CREATE;
+		}
+
+		List<String> copy_args;
+		String copy_command;
+		if (export_format == EXPORT_FORMAT_AAB) {
+			copy_command = vformat("copyAndRename%sAab", build_type);
+		} else if (export_format == EXPORT_FORMAT_APK) {
+			copy_command = vformat("copyAndRename%sApk", build_type);
+		}
+
+		copy_args.push_back(copy_command);
+
+		copy_args.push_back("-p"); // argument to specify the start directory.
+		copy_args.push_back(build_path); // start directory.
+
+		String export_filename = p_path.get_file();
+		String export_path = p_path.get_base_dir();
+		if (export_path.is_rel_path()) {
+			export_path = OS::get_singleton()->get_resource_dir().plus_file(export_path);
+		}
+		export_path = ProjectSettings::get_singleton()->globalize_path(export_path).simplify_path();
+
+		copy_args.push_back("-Pexport_path=file:" + export_path);
+		copy_args.push_back("-Pexport_filename=" + export_filename);
+
+		print_verbose("Copying Android binary using gradle command: " + String("\n") + build_command + " " + join_list(copy_args, String(" ")));
+		int copy_result = EditorNode::get_singleton()->execute_and_show_output(TTR("Moving output"), build_command, copy_args);
+		if (copy_result != 0) {
+			EditorNode::get_singleton()->show_warning(TTR("Unable to copy and rename export file, check gradle project directory for outputs."));
+			return ERR_CANT_CREATE;
+		}
+
+		print_verbose("Successfully completed Android custom build.");
+		return OK;
+	}
+	// This is the start of the Legacy build system
+	print_verbose("Starting legacy build system..");
+	if (p_debug) {
+		src_apk = p_preset->get("custom_template/debug");
+	} else {
+		src_apk = p_preset->get("custom_template/release");
+	}
+	src_apk = src_apk.strip_edges();
+	if (src_apk == "") {
+		if (p_debug) {
+			src_apk = find_export_template("android_debug.apk");
+		} else {
+			src_apk = find_export_template("android_release.apk");
+		}
+		if (src_apk == "") {
+			EditorNode::add_io_error(vformat(TTR("Package not found: %s"), src_apk));
+			return ERR_FILE_NOT_FOUND;
+		}
+	}
+
+	if (!DirAccess::exists(p_path.get_base_dir())) {
+		return ERR_FILE_BAD_PATH;
+	}
+
+	FileAccess *src_f = nullptr;
+	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
+
+	if (ep.step(TTR("Creating APK..."), 0)) {
+		return ERR_SKIP;
+	}
+
+	unzFile pkg = unzOpen2(src_apk.utf8().get_data(), &io);
+	if (!pkg) {
+		EditorNode::add_io_error(vformat(TTR("Could not find template APK to export:\n%s"), src_apk));
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	int ret = unzGoToFirstFile(pkg);
+
+	zlib_filefunc_def io2 = io;
+	FileAccess *dst_f = nullptr;
+	io2.opaque = &dst_f;
+
+	String tmp_unaligned_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpexport-unaligned." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
+
+#define CLEANUP_AND_RETURN(m_err)                            \
+	{                                                        \
+		DirAccess::remove_file_or_error(tmp_unaligned_path); \
+		return m_err;                                        \
+	}
+
+	zipFile unaligned_apk = zipOpen2(tmp_unaligned_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2);
+
+	String cmdline = p_preset->get("command_line/extra_args");
+
+	String version_name = p_preset->get("version/name");
+	String package_name = p_preset->get("package/unique_name");
+
+	String apk_expansion_pkey = p_preset->get("apk_expansion/public_key");
+
+	Vector<String> invalid_abis(enabled_abis);
+	while (ret == UNZ_OK) {
+		//get filename
+		unz_file_info info;
+		char fname[16384];
+		ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
+
+		bool skip = false;
+
+		String file = fname;
+
+		Vector<uint8_t> data;
+		data.resize(info.uncompressed_size);
+
+		//read
+		unzOpenCurrentFile(pkg);
+		unzReadCurrentFile(pkg, data.ptrw(), data.size());
+		unzCloseCurrentFile(pkg);
+
+		//write
+		if (file == "AndroidManifest.xml") {
+			_fix_manifest(p_preset, data, p_give_internet);
+		}
+		if (file == "resources.arsc") {
+			_fix_resources(p_preset, data);
+		}
+
+		// Process the splash image
+		if ((file == SPLASH_IMAGE_EXPORT_PATH || file == LEGACY_BUILD_SPLASH_IMAGE_EXPORT_PATH) && splash_image.is_valid() && !splash_image->is_empty()) {
+			_load_image_data(splash_image, data);
+		}
+
+		// Process the splash bg color image
+		if ((file == SPLASH_BG_COLOR_PATH || file == LEGACY_BUILD_SPLASH_BG_COLOR_PATH) && splash_bg_color_image.is_valid() && !splash_bg_color_image->is_empty()) {
+			_load_image_data(splash_bg_color_image, data);
+		}
+
+		for (int i = 0; i < icon_densities_count; ++i) {
+			if (main_image.is_valid() && !main_image->is_empty()) {
+				if (file == launcher_icons[i].export_path) {
+					_process_launcher_icons(file, main_image, launcher_icons[i].dimensions, data);
+				}
+			}
+			if (foreground.is_valid() && !foreground->is_empty()) {
+				if (file == launcher_adaptive_icon_foregrounds[i].export_path) {
+					_process_launcher_icons(file, foreground, launcher_adaptive_icon_foregrounds[i].dimensions, data);
+				}
+			}
+			if (background.is_valid() && !background->is_empty()) {
+				if (file == launcher_adaptive_icon_backgrounds[i].export_path) {
+					_process_launcher_icons(file, background, launcher_adaptive_icon_backgrounds[i].dimensions, data);
+				}
+			}
+		}
+
+		if (file.ends_with(".so")) {
+			bool enabled = false;
+			for (int i = 0; i < enabled_abis.size(); ++i) {
+				if (file.begins_with("lib/" + enabled_abis[i] + "/")) {
+					invalid_abis.erase(enabled_abis[i]);
+					enabled = true;
+					break;
+				}
+			}
+			if (!enabled) {
+				skip = true;
+			}
+		}
+
+		if (file.begins_with("META-INF") && should_sign) {
+			skip = true;
+		}
+
+		if (!skip) {
+			print_line("ADDING: " + file);
+
+			// Respect decision on compression made by AAPT for the export template
+			const bool uncompressed = info.compression_method == 0;
+
+			zip_fileinfo zipfi = get_zip_fileinfo();
+
+			zipOpenNewFileInZip(unaligned_apk,
+					file.utf8().get_data(),
+					&zipfi,
+					nullptr,
+					0,
+					nullptr,
+					0,
+					nullptr,
+					uncompressed ? 0 : Z_DEFLATED,
+					Z_DEFAULT_COMPRESSION);
+
+			zipWriteInFileInZip(unaligned_apk, data.ptr(), data.size());
+			zipCloseFileInZip(unaligned_apk);
+		}
+
+		ret = unzGoToNextFile(pkg);
+	}
+
+	if (!invalid_abis.is_empty()) {
+		String unsupported_arch = String(", ").join(invalid_abis);
+		EditorNode::add_io_error(vformat(TTR("Missing libraries in the export template for the selected architectures: %s.\nPlease build a template with all required libraries, or uncheck the missing architectures in the export preset."), unsupported_arch));
+		CLEANUP_AND_RETURN(ERR_FILE_NOT_FOUND);
+	}
+
+	if (ep.step(TTR("Adding files..."), 1)) {
+		CLEANUP_AND_RETURN(ERR_SKIP);
+	}
+	err = OK;
+
+	if (p_flags & DEBUG_FLAG_DUMB_CLIENT) {
+		APKExportData ed;
+		ed.ep = &ep;
+		ed.apk = unaligned_apk;
+		err = export_project_files(p_preset, ignore_apk_file, &ed, save_apk_so);
+	} else {
+		if (apk_expansion) {
+			err = save_apk_expansion_file(p_preset, p_path);
+			if (err != OK) {
+				EditorNode::add_io_error(TTR("Could not write expansion package file!"));
+				return err;
+			}
+		} else {
+			APKExportData ed;
+			ed.ep = &ep;
+			ed.apk = unaligned_apk;
+			err = export_project_files(p_preset, save_apk_file, &ed, save_apk_so);
+		}
+	}
+
+	if (err != OK) {
+		unzClose(pkg);
+		EditorNode::add_io_error(TTR("Could not export project files"));
+		CLEANUP_AND_RETURN(ERR_SKIP);
+	}
+
+	zip_fileinfo zipfi = get_zip_fileinfo();
+	zipOpenNewFileInZip(unaligned_apk,
+			"assets/_cl_",
+			&zipfi,
+			nullptr,
+			0,
+			nullptr,
+			0,
+			nullptr,
+			0, // No compress (little size gain and potentially slower startup)
+			Z_DEFAULT_COMPRESSION);
+	zipWriteInFileInZip(unaligned_apk, command_line_flags.ptr(), command_line_flags.size());
+	zipCloseFileInZip(unaligned_apk);
+	zipClose(unaligned_apk, nullptr);
+	unzClose(pkg);
+
+	if (err != OK) {
+		CLEANUP_AND_RETURN(err);
+	}
+
+	// Let's zip-align (must be done before signing)
+
+	static const int ZIP_ALIGNMENT = 4;
+
+	// If we're not signing the apk, then the next step should be the last.
+	const int next_step = should_sign ? 103 : 105;
+	if (ep.step(TTR("Aligning APK..."), next_step)) {
+		CLEANUP_AND_RETURN(ERR_SKIP);
+	}
+
+	unzFile tmp_unaligned = unzOpen2(tmp_unaligned_path.utf8().get_data(), &io);
+	if (!tmp_unaligned) {
+		EditorNode::add_io_error(TTR("Could not unzip temporary unaligned APK."));
+		CLEANUP_AND_RETURN(ERR_FILE_NOT_FOUND);
+	}
+
+	ret = unzGoToFirstFile(tmp_unaligned);
+
+	io2 = io;
+	dst_f = nullptr;
+	io2.opaque = &dst_f;
+	zipFile final_apk = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2);
+
+	// Take files from the unaligned APK and write them out to the aligned one
+	// in raw mode, i.e. not uncompressing and recompressing, aligning them as needed,
+	// following what is done in https://github.com/android/platform_build/blob/master/tools/zipalign/ZipAlign.cpp
+	int bias = 0;
+	while (ret == UNZ_OK) {
+		unz_file_info info;
+		memset(&info, 0, sizeof(info));
+
+		char fname[16384];
+		char extra[16384];
+		ret = unzGetCurrentFileInfo(tmp_unaligned, &info, fname, 16384, extra, 16384 - ZIP_ALIGNMENT, nullptr, 0);
+
+		String file = fname;
+
+		Vector<uint8_t> data;
+		data.resize(info.compressed_size);
+
+		// read
+		int method, level;
+		unzOpenCurrentFile2(tmp_unaligned, &method, &level, 1); // raw read
+		long file_offset = unzGetCurrentFileZStreamPos64(tmp_unaligned);
+		unzReadCurrentFile(tmp_unaligned, data.ptrw(), data.size());
+		unzCloseCurrentFile(tmp_unaligned);
+
+		// align
+		int padding = 0;
+		if (!info.compression_method) {
+			// Uncompressed file => Align
+			long new_offset = file_offset + bias;
+			padding = (ZIP_ALIGNMENT - (new_offset % ZIP_ALIGNMENT)) % ZIP_ALIGNMENT;
+		}
+
+		memset(extra + info.size_file_extra, 0, padding);
+
+		zip_fileinfo fileinfo = get_zip_fileinfo();
+		zipOpenNewFileInZip2(final_apk,
+				file.utf8().get_data(),
+				&fileinfo,
+				extra,
+				info.size_file_extra + padding,
+				nullptr,
+				0,
+				nullptr,
+				method,
+				level,
+				1); // raw write
+		zipWriteInFileInZip(final_apk, data.ptr(), data.size());
+		zipCloseFileInZipRaw(final_apk, info.uncompressed_size, info.crc);
+
+		bias += padding;
+
+		ret = unzGoToNextFile(tmp_unaligned);
+	}
+
+	zipClose(final_apk, nullptr);
+	unzClose(tmp_unaligned);
+
+	if (should_sign) {
+		// Signing must be done last as any additional modifications to the
+		// file will invalidate the signature.
+		err = sign_apk(p_preset, p_debug, p_path, ep);
+		if (err != OK) {
+			CLEANUP_AND_RETURN(err);
+		}
+	}
+
+	CLEANUP_AND_RETURN(OK);
+}
+
+void EditorExportPlatformAndroid::get_platform_features(List<String> *r_features) {
+	r_features->push_back("mobile");
+	r_features->push_back("Android");
+}
+
+void EditorExportPlatformAndroid::resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) {
+}
+
+EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
+	Ref<Image> img = memnew(Image(_android_logo));
+	logo.instantiate();
+	logo->create_from_image(img);
+
+	img = Ref<Image>(memnew(Image(_android_run_icon)));
+	run_icon.instantiate();
+	run_icon->create_from_image(img);
+
+	devices_changed.set();
+	plugins_changed.set();
+	check_for_changes_thread.start(_check_for_changes_poll_thread, this);
+}
+
+EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
+	quit_request.set();
+	check_for_changes_thread.wait_to_finish();
+}
diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h
new file mode 100644
index 0000000000..909428c2fe
--- /dev/null
+++ b/platform/android/export/export_plugin.h
@@ -0,0 +1,255 @@
+/*************************************************************************/
+/*  export_plugin.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/image_loader.h"
+#include "core/io/json.h"
+#include "core/io/marshalls.h"
+#include "core/io/zip_io.h"
+#include "core/os/os.h"
+#include "core/templates/safe_refcount.h"
+#include "core/version.h"
+#include "drivers/png/png_driver_common.h"
+#include "editor/editor_export.h"
+#include "editor/editor_log.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "main/splash.gen.h"
+#include "platform/android/logo.gen.h"
+#include "platform/android/run_icon.gen.h"
+
+#include "godot_plugin_config.h"
+#include "gradle_export_util.h"
+
+#include <string.h>
+
+const String SPLASH_CONFIG_XML_CONTENT = R"SPLASH(<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/splash_bg_color" />
+    <item>
+        <bitmap
+                android:gravity="center"
+                android:filter="%s"
+                android:src="@drawable/splash" />
+    </item>
+</layer-list>
+)SPLASH";
+
+struct LauncherIcon {
+	const char *export_path;
+	int dimensions = 0;
+};
+
+class EditorExportPlatformAndroid : public EditorExportPlatform {
+	GDCLASS(EditorExportPlatformAndroid, EditorExportPlatform);
+
+	Ref<ImageTexture> logo;
+	Ref<ImageTexture> run_icon;
+
+	struct Device {
+		String id;
+		String name;
+		String description;
+		int api_level = 0;
+	};
+
+	struct APKExportData {
+		zipFile apk;
+		EditorProgress *ep = nullptr;
+	};
+
+	struct CustomExportData {
+		bool debug;
+		Vector<String> libs;
+	};
+
+	Vector<PluginConfigAndroid> plugins;
+	String last_plugin_names;
+	uint64_t last_custom_build_time = 0;
+	SafeFlag plugins_changed;
+	Mutex plugins_lock;
+	Vector<Device> devices;
+	SafeFlag devices_changed;
+	Mutex device_lock;
+	Thread check_for_changes_thread;
+	SafeFlag quit_request;
+
+	static void _check_for_changes_poll_thread(void *ud);
+
+	String get_project_name(const String &p_name) const;
+
+	String get_package_name(const String &p_package) const;
+
+	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const;
+
+	static bool _should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data);
+
+	static zip_fileinfo get_zip_fileinfo();
+
+	static Vector<String> get_abis();
+
+	/// List the gdap files in the directory specified by the p_path parameter.
+	static Vector<String> list_gdap_files(const String &p_path);
+
+	static Vector<PluginConfigAndroid> get_plugins();
+
+	static Vector<PluginConfigAndroid> get_enabled_plugins(const Ref<EditorExportPreset> &p_presets);
+
+	static Error store_in_apk(APKExportData *ed, const String &p_path, const Vector<uint8_t> &p_data, int compression_method = Z_DEFLATED);
+
+	static Error save_apk_so(void *p_userdata, const SharedObject &p_so);
+
+	static Error 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);
+
+	static Error ignore_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);
+
+	static Error copy_gradle_so(void *p_userdata, const SharedObject &p_so);
+
+	void _get_permissions(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions);
+
+	void _write_tmp_manifest(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, bool p_debug);
+
+	void _fix_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_manifest, bool p_give_internet);
+
+	static String _parse_string(const uint8_t *p_bytes, bool p_utf8);
+
+	void _fix_resources(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &r_manifest);
+
+	void _load_image_data(const Ref<Image> &p_splash_image, Vector<uint8_t> &p_data);
+
+	void _process_launcher_icons(const String &p_file_name, const Ref<Image> &p_source_image, int dimension, Vector<uint8_t> &p_data);
+
+	String load_splash_refs(Ref<Image> &splash_image, Ref<Image> &splash_bg_color_image);
+
+	void load_icon_refs(const Ref<EditorExportPreset> &p_preset, Ref<Image> &icon, Ref<Image> &foreground, Ref<Image> &background);
+
+	void store_image(const LauncherIcon launcher_icon, const Vector<uint8_t> &data);
+
+	void store_image(const String &export_path, const Vector<uint8_t> &data);
+
+	void _copy_icons_to_gradle_project(const Ref<EditorExportPreset> &p_preset,
+			const String &processed_splash_config_xml,
+			const Ref<Image> &splash_image,
+			const Ref<Image> &splash_bg_color_image,
+			const Ref<Image> &main_image,
+			const Ref<Image> &foreground,
+			const Ref<Image> &background);
+
+	static Vector<String> get_enabled_abis(const Ref<EditorExportPreset> &p_preset);
+
+public:
+	typedef Error (*EditorExportSaveFunction)(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);
+
+public:
+	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
+
+	virtual void get_export_options(List<ExportOption> *r_options) override;
+
+	virtual String get_name() const override;
+
+	virtual String get_os_name() const override;
+
+	virtual Ref<Texture2D> get_logo() const override;
+
+	virtual bool should_update_export_options() override;
+
+	virtual bool poll_export() override;
+
+	virtual int get_options_count() const override;
+
+	virtual String get_options_tooltip() const override;
+
+	virtual String get_option_label(int p_index) const override;
+
+	virtual String get_option_tooltip(int p_index) const override;
+
+	virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) override;
+
+	virtual Ref<Texture2D> get_run_icon() const override;
+
+	static String get_adb_path();
+
+	static String get_apksigner_path();
+
+	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+
+	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
+
+	inline bool is_clean_build_required(Vector<PluginConfigAndroid> enabled_plugins) {
+		String plugin_names = PluginConfigAndroid::get_plugins_names(enabled_plugins);
+		bool first_build = last_custom_build_time == 0;
+		bool have_plugins_changed = false;
+
+		if (!first_build) {
+			have_plugins_changed = plugin_names != last_plugin_names;
+			if (!have_plugins_changed) {
+				for (int i = 0; i < enabled_plugins.size(); i++) {
+					if (enabled_plugins.get(i).last_updated > last_custom_build_time) {
+						have_plugins_changed = true;
+						break;
+					}
+				}
+			}
+		}
+
+		last_custom_build_time = OS::get_singleton()->get_unix_time();
+		last_plugin_names = plugin_names;
+
+		return have_plugins_changed || first_build;
+	}
+
+	String get_apk_expansion_fullpath(const Ref<EditorExportPreset> &p_preset, const String &p_path);
+
+	Error save_apk_expansion_file(const Ref<EditorExportPreset> &p_preset, const String &p_path);
+
+	void get_command_line_flags(const Ref<EditorExportPreset> &p_preset, const String &p_path, int p_flags, Vector<uint8_t> &r_command_line_flags);
+
+	Error sign_apk(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &export_path, EditorProgress &ep);
+
+	void _clear_assets_directory();
+
+	void _remove_copied_libs();
+
+	String join_list(List<String> parts, const String &separator) const;
+
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
+
+	Error export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int export_format, bool should_sign, int p_flags);
+
+	virtual void get_platform_features(List<String> *r_features) override;
+
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override;
+
+	EditorExportPlatformAndroid();
+
+	~EditorExportPlatformAndroid();
+};
diff --git a/platform/android/plugin/godot_plugin_config.h b/platform/android/export/godot_plugin_config.cpp
index 6b708548ae..ba7b8ce6c7 100644
--- a/platform/android/plugin/godot_plugin_config.h
+++ b/platform/android/export/godot_plugin_config.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  godot_plugin_config.h                                                */
+/*  godot_plugin_config.cpp                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,78 +28,23 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_PLUGIN_CONFIG_H
-#define GODOT_PLUGIN_CONFIG_H
-
-#include "core/error/error_list.h"
-#include "core/io/config_file.h"
-#include "core/string/ustring.h"
-
-/*
- The `config` section and fields are required and defined as follow:
-- **name**: name of the plugin.
-- **binary_type**: can be either `local` or `remote`. The type affects the **binary** field.
-- **binary**:
-  - if **binary_type** is `local`, then this should be the filename of the plugin `aar` file in the `res://android/plugins` directory (e.g: `MyPlugin.aar`).
-  - if **binary_type** is `remote`, then this should be a declaration for a remote gradle binary (e.g: "org.godot.example:my-plugin:0.0.0").
-
-The `dependencies` section and fields are optional and defined as follow:
-- **local**: contains a list of local `.aar` binary files the plugin depends on. The local binary dependencies must also be located in the `res://android/plugins` directory.
-- **remote**: contains a list of remote binary gradle dependencies for the plugin.
-- **custom_maven_repos**: contains a list of urls specifying custom maven repos required for the plugin's dependencies.
-
- See https://github.com/godotengine/godot/issues/38157#issuecomment-618773871
- */
-struct PluginConfigAndroid {
-	inline static const char *PLUGIN_CONFIG_EXT = ".gdap";
-
-	inline static const char *CONFIG_SECTION = "config";
-	inline static const char *CONFIG_NAME_KEY = "name";
-	inline static const char *CONFIG_BINARY_TYPE_KEY = "binary_type";
-	inline static const char *CONFIG_BINARY_KEY = "binary";
-
-	inline static const char *DEPENDENCIES_SECTION = "dependencies";
-	inline static const char *DEPENDENCIES_LOCAL_KEY = "local";
-	inline static const char *DEPENDENCIES_REMOTE_KEY = "remote";
-	inline static const char *DEPENDENCIES_CUSTOM_MAVEN_REPOS_KEY = "custom_maven_repos";
-
-	inline static const char *BINARY_TYPE_LOCAL = "local";
-	inline static const char *BINARY_TYPE_REMOTE = "remote";
-
-	inline static const char *PLUGIN_VALUE_SEPARATOR = "|";
-
-	// Set to true when the config file is properly loaded.
-	bool valid_config = false;
-	// Unix timestamp of last change to this plugin.
-	uint64_t last_updated = 0;
-
-	// Required config section
-	String name;
-	String binary_type;
-	String binary;
-
-	// Optional dependencies section
-	Vector<String> local_dependencies;
-	Vector<String> remote_dependencies;
-	Vector<String> custom_maven_repos;
-};
-
+#include "godot_plugin_config.h"
 /*
  * Set of prebuilt plugins.
  * Currently unused, this is just for future reference:
  */
 // static const PluginConfigAndroid MY_PREBUILT_PLUGIN = {
-//	/*.valid_config =*/true,
-//	/*.last_updated =*/0,
-//	/*.name =*/"GodotPayment",
-//	/*.binary_type =*/"local",
-//	/*.binary =*/"res://android/build/libs/plugins/GodotPayment.release.aar",
-//	/*.local_dependencies =*/{},
-// 	/*.remote_dependencies =*/String("com.android.billingclient:billing:2.2.1").split("|"),
-// 	/*.custom_maven_repos =*/{}
+//    /*.valid_config =*/true,
+//    /*.last_updated =*/0,
+//    /*.name =*/"GodotPayment",
+//    /*.binary_type =*/"local",
+//    /*.binary =*/"res://android/build/libs/plugins/GodotPayment.release.aar",
+//    /*.local_dependencies =*/{},
+//     /*.remote_dependencies =*/String("com.android.billingclient:billing:2.2.1").split("|"),
+//     /*.custom_maven_repos =*/{}
 // };
 
-static inline String resolve_local_dependency_path(String plugin_config_dir, String dependency_path) {
+String PluginConfigAndroid::resolve_local_dependency_path(String plugin_config_dir, String dependency_path) {
 	String absolute_path;
 	if (!dependency_path.is_empty()) {
 		if (dependency_path.is_absolute_path()) {
@@ -112,7 +57,7 @@ static inline String resolve_local_dependency_path(String plugin_config_dir, Str
 	return absolute_path;
 }
 
-static inline PluginConfigAndroid resolve_prebuilt_plugin(PluginConfigAndroid prebuilt_plugin, String plugin_config_dir) {
+PluginConfigAndroid PluginConfigAndroid::resolve_prebuilt_plugin(PluginConfigAndroid prebuilt_plugin, String plugin_config_dir) {
 	PluginConfigAndroid resolved = prebuilt_plugin;
 	resolved.binary = resolved.binary_type == PluginConfigAndroid::BINARY_TYPE_LOCAL ? resolve_local_dependency_path(plugin_config_dir, prebuilt_plugin.binary) : prebuilt_plugin.binary;
 	if (!prebuilt_plugin.local_dependencies.is_empty()) {
@@ -124,13 +69,13 @@ static inline PluginConfigAndroid resolve_prebuilt_plugin(PluginConfigAndroid pr
 	return resolved;
 }
 
-static inline Vector<PluginConfigAndroid> get_prebuilt_plugins(String plugins_base_dir) {
+Vector<PluginConfigAndroid> PluginConfigAndroid::get_prebuilt_plugins(String plugins_base_dir) {
 	Vector<PluginConfigAndroid> prebuilt_plugins;
 	// prebuilt_plugins.push_back(resolve_prebuilt_plugin(MY_PREBUILT_PLUGIN, plugins_base_dir));
 	return prebuilt_plugins;
 }
 
-static inline bool is_plugin_config_valid(PluginConfigAndroid plugin_config) {
+bool PluginConfigAndroid::is_plugin_config_valid(PluginConfigAndroid plugin_config) {
 	bool valid_name = !plugin_config.name.is_empty();
 	bool valid_binary_type = plugin_config.binary_type == PluginConfigAndroid::BINARY_TYPE_LOCAL ||
 							 plugin_config.binary_type == PluginConfigAndroid::BINARY_TYPE_REMOTE;
@@ -155,7 +100,7 @@ static inline bool is_plugin_config_valid(PluginConfigAndroid plugin_config) {
 	return valid_name && valid_binary && valid_binary_type && valid_local_dependencies;
 }
 
-static inline uint64_t get_plugin_modification_time(const PluginConfigAndroid &plugin_config, const String &config_path) {
+uint64_t PluginConfigAndroid::get_plugin_modification_time(const PluginConfigAndroid &plugin_config, const String &config_path) {
 	uint64_t last_updated = FileAccess::get_modified_time(config_path);
 	last_updated = MAX(last_updated, FileAccess::get_modified_time(plugin_config.binary));
 
@@ -167,7 +112,7 @@ static inline uint64_t get_plugin_modification_time(const PluginConfigAndroid &p
 	return last_updated;
 }
 
-static inline PluginConfigAndroid load_plugin_config(Ref<ConfigFile> config_file, const String &path) {
+PluginConfigAndroid PluginConfigAndroid::load_plugin_config(Ref<ConfigFile> config_file, const String &path) {
 	PluginConfigAndroid plugin_config = {};
 
 	if (config_file.is_valid()) {
@@ -201,7 +146,7 @@ static inline PluginConfigAndroid load_plugin_config(Ref<ConfigFile> config_file
 	return plugin_config;
 }
 
-static inline String get_plugins_binaries(String binary_type, Vector<PluginConfigAndroid> plugins_configs) {
+String PluginConfigAndroid::get_plugins_binaries(String binary_type, Vector<PluginConfigAndroid> plugins_configs) {
 	String plugins_binaries;
 	if (!plugins_configs.is_empty()) {
 		Vector<String> binaries;
@@ -230,7 +175,7 @@ static inline String get_plugins_binaries(String binary_type, Vector<PluginConfi
 	return plugins_binaries;
 }
 
-static inline String get_plugins_custom_maven_repos(Vector<PluginConfigAndroid> plugins_configs) {
+String PluginConfigAndroid::get_plugins_custom_maven_repos(Vector<PluginConfigAndroid> plugins_configs) {
 	String custom_maven_repos;
 	if (!plugins_configs.is_empty()) {
 		Vector<String> repos_urls;
@@ -248,7 +193,7 @@ static inline String get_plugins_custom_maven_repos(Vector<PluginConfigAndroid>
 	return custom_maven_repos;
 }
 
-static inline String get_plugins_names(Vector<PluginConfigAndroid> plugins_configs) {
+String PluginConfigAndroid::get_plugins_names(Vector<PluginConfigAndroid> plugins_configs) {
 	String plugins_names;
 	if (!plugins_configs.is_empty()) {
 		Vector<String> names;
@@ -265,5 +210,3 @@ static inline String get_plugins_names(Vector<PluginConfigAndroid> plugins_confi
 
 	return plugins_names;
 }
-
-#endif // GODOT_PLUGIN_CONFIG_H
diff --git a/platform/android/export/godot_plugin_config.h b/platform/android/export/godot_plugin_config.h
new file mode 100644
index 0000000000..c016634371
--- /dev/null
+++ b/platform/android/export/godot_plugin_config.h
@@ -0,0 +1,106 @@
+/*************************************************************************/
+/*  godot_plugin_config.h                                                */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef ANDROID_GODOT_PLUGIN_CONFIG_H
+#define ANDROID_GODOT_PLUGIN_CONFIG_H
+
+#include "core/config/project_settings.h"
+#include "core/error/error_list.h"
+#include "core/io/config_file.h"
+#include "core/string/ustring.h"
+
+/*
+ The `config` section and fields are required and defined as follow:
+- **name**: name of the plugin.
+- **binary_type**: can be either `local` or `remote`. The type affects the **binary** field.
+- **binary**:
+  - if **binary_type** is `local`, then this should be the filename of the plugin `aar` file in the `res://android/plugins` directory (e.g: `MyPlugin.aar`).
+  - if **binary_type** is `remote`, then this should be a declaration for a remote gradle binary (e.g: "org.godot.example:my-plugin:0.0.0").
+
+The `dependencies` section and fields are optional and defined as follow:
+- **local**: contains a list of local `.aar` binary files the plugin depends on. The local binary dependencies must also be located in the `res://android/plugins` directory.
+- **remote**: contains a list of remote binary gradle dependencies for the plugin.
+- **custom_maven_repos**: contains a list of urls specifying custom maven repos required for the plugin's dependencies.
+
+ See https://github.com/godotengine/godot/issues/38157#issuecomment-618773871
+ */
+struct PluginConfigAndroid {
+	inline static const char *PLUGIN_CONFIG_EXT = ".gdap";
+
+	inline static const char *CONFIG_SECTION = "config";
+	inline static const char *CONFIG_NAME_KEY = "name";
+	inline static const char *CONFIG_BINARY_TYPE_KEY = "binary_type";
+	inline static const char *CONFIG_BINARY_KEY = "binary";
+
+	inline static const char *DEPENDENCIES_SECTION = "dependencies";
+	inline static const char *DEPENDENCIES_LOCAL_KEY = "local";
+	inline static const char *DEPENDENCIES_REMOTE_KEY = "remote";
+	inline static const char *DEPENDENCIES_CUSTOM_MAVEN_REPOS_KEY = "custom_maven_repos";
+
+	inline static const char *BINARY_TYPE_LOCAL = "local";
+	inline static const char *BINARY_TYPE_REMOTE = "remote";
+
+	inline static const char *PLUGIN_VALUE_SEPARATOR = "|";
+
+	// Set to true when the config file is properly loaded.
+	bool valid_config = false;
+	// Unix timestamp of last change to this plugin.
+	uint64_t last_updated = 0;
+
+	// Required config section
+	String name;
+	String binary_type;
+	String binary;
+
+	// Optional dependencies section
+	Vector<String> local_dependencies;
+	Vector<String> remote_dependencies;
+	Vector<String> custom_maven_repos;
+
+	static String resolve_local_dependency_path(String plugin_config_dir, String dependency_path);
+
+	static PluginConfigAndroid resolve_prebuilt_plugin(PluginConfigAndroid prebuilt_plugin, String plugin_config_dir);
+
+	static Vector<PluginConfigAndroid> get_prebuilt_plugins(String plugins_base_dir);
+
+	static bool is_plugin_config_valid(PluginConfigAndroid plugin_config);
+
+	static uint64_t get_plugin_modification_time(const PluginConfigAndroid &plugin_config, const String &config_path);
+
+	static PluginConfigAndroid load_plugin_config(Ref<ConfigFile> config_file, const String &path);
+
+	static String get_plugins_binaries(String binary_type, Vector<PluginConfigAndroid> plugins_configs);
+
+	static String get_plugins_custom_maven_repos(Vector<PluginConfigAndroid> plugins_configs);
+
+	static String get_plugins_names(Vector<PluginConfigAndroid> plugins_configs);
+};
+
+#endif // GODOT_PLUGIN_CONFIG_H
diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp
new file mode 100644
index 0000000000..354287d872
--- /dev/null
+++ b/platform/android/export/gradle_export_util.cpp
@@ -0,0 +1,252 @@
+/*************************************************************************/
+/*  gradle_export_util.cpp                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gradle_export_util.h"
+
+int _get_android_orientation_value(DisplayServer::ScreenOrientation screen_orientation) {
+	switch (screen_orientation) {
+		case DisplayServer::SCREEN_PORTRAIT:
+			return 1;
+		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
+			return 8;
+		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
+			return 9;
+		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
+			return 11;
+		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
+			return 12;
+		case DisplayServer::SCREEN_SENSOR:
+			return 13;
+		case DisplayServer::SCREEN_LANDSCAPE:
+		default:
+			return 0;
+	}
+}
+
+String _get_android_orientation_label(DisplayServer::ScreenOrientation screen_orientation) {
+	switch (screen_orientation) {
+		case DisplayServer::SCREEN_PORTRAIT:
+			return "portrait";
+		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
+			return "reverseLandscape";
+		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
+			return "reversePortrait";
+		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
+			return "userLandscape";
+		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
+			return "userPortrait";
+		case DisplayServer::SCREEN_SENSOR:
+			return "fullUser";
+		case DisplayServer::SCREEN_LANDSCAPE:
+		default:
+			return "landscape";
+	}
+}
+
+// Utility method used to create a directory.
+Error create_directory(const String &p_dir) {
+	if (!DirAccess::exists(p_dir)) {
+		DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+		ERR_FAIL_COND_V_MSG(!filesystem_da, ERR_CANT_CREATE, "Cannot create directory '" + p_dir + "'.");
+		Error err = filesystem_da->make_dir_recursive(p_dir);
+		ERR_FAIL_COND_V_MSG(err, ERR_CANT_CREATE, "Cannot create directory '" + p_dir + "'.");
+		memdelete(filesystem_da);
+	}
+	return OK;
+}
+
+// Writes p_data into a file at p_path, creating directories if necessary.
+// Note: this will overwrite the file at p_path if it already exists.
+Error store_file_at_path(const String &p_path, const Vector<uint8_t> &p_data) {
+	String dir = p_path.get_base_dir();
+	Error err = create_directory(dir);
+	if (err != OK) {
+		return err;
+	}
+	FileAccess *fa = FileAccess::open(p_path, FileAccess::WRITE);
+	ERR_FAIL_COND_V_MSG(!fa, ERR_CANT_CREATE, "Cannot create file '" + p_path + "'.");
+	fa->store_buffer(p_data.ptr(), p_data.size());
+	memdelete(fa);
+	return OK;
+}
+
+// Writes string p_data into a file at p_path, creating directories if necessary.
+// Note: this will overwrite the file at p_path if it already exists.
+Error store_string_at_path(const String &p_path, const String &p_data) {
+	String dir = p_path.get_base_dir();
+	Error err = create_directory(dir);
+	if (err != OK) {
+		if (OS::get_singleton()->is_stdout_verbose()) {
+			print_error("Unable to write data into " + p_path);
+		}
+		return err;
+	}
+	FileAccess *fa = FileAccess::open(p_path, FileAccess::WRITE);
+	ERR_FAIL_COND_V_MSG(!fa, ERR_CANT_CREATE, "Cannot create file '" + p_path + "'.");
+	fa->store_string(p_data);
+	memdelete(fa);
+	return OK;
+}
+
+// Implementation of EditorExportSaveFunction.
+// This method will only be called as an input to export_project_files.
+// It is used by the export_project_files method to save all the asset files into the gradle project.
+// It's functionality mirrors that of the method save_apk_file.
+// This method will be called ONLY when custom build is enabled.
+Error rename_and_store_file_in_gradle_project(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) {
+	String dst_path = p_path.replace_first("res://", "res://android/build/assets/");
+	print_verbose("Saving project files from " + p_path + " into " + dst_path);
+	Error err = store_file_at_path(dst_path, p_data);
+	return err;
+}
+
+// Creates strings.xml files inside the gradle project for different locales.
+Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name) {
+	print_verbose("Creating strings resources for supported locales for project " + project_name);
+	// Stores the string into the default values directory.
+	String processed_default_xml_string = vformat(godot_project_name_xml_string, project_name.xml_escape(true));
+	store_string_at_path("res://android/build/res/values/godot_project_name_string.xml", processed_default_xml_string);
+
+	// Searches the Gradle project res/ directory to find all supported locales
+	DirAccessRef da = DirAccess::open("res://android/build/res");
+	if (!da) {
+		if (OS::get_singleton()->is_stdout_verbose()) {
+			print_error("Unable to open Android resources directory.");
+		}
+		return ERR_CANT_OPEN;
+	}
+	da->list_dir_begin();
+	while (true) {
+		String file = da->get_next();
+		if (file == "") {
+			break;
+		}
+		if (!file.begins_with("values-")) {
+			// NOTE: This assumes all directories that start with "values-" are for localization.
+			continue;
+		}
+		String locale = file.replace("values-", "").replace("-r", "_");
+		String property_name = "application/config/name_" + locale;
+		String locale_directory = "res://android/build/res/" + file + "/godot_project_name_string.xml";
+		if (ProjectSettings::get_singleton()->has_setting(property_name)) {
+			String locale_project_name = ProjectSettings::get_singleton()->get(property_name);
+			String processed_xml_string = vformat(godot_project_name_xml_string, locale_project_name.xml_escape(true));
+			print_verbose("Storing project name for locale " + locale + " under " + locale_directory);
+			store_string_at_path(locale_directory, processed_xml_string);
+		} else {
+			// TODO: Once the legacy build system is deprecated we don't need to have xml files for this else branch
+			store_string_at_path(locale_directory, processed_default_xml_string);
+		}
+	}
+	da->list_dir_end();
+	return OK;
+}
+
+String bool_to_string(bool v) {
+	return v ? "true" : "false";
+}
+
+String _get_gles_tag() {
+	bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/driver/driver_name") == "GLES3" &&
+					 !ProjectSettings::get_singleton()->get("rendering/driver/fallback_to_gles2");
+	return min_gles3 ? "    <uses-feature android:glEsVersion=\"0x00030000\" android:required=\"true\" />\n" : "";
+}
+
+String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset) {
+	String manifest_screen_sizes = "    <supports-screens \n        tools:node=\"replace\"";
+	String sizes[] = { "small", "normal", "large", "xlarge" };
+	size_t num_sizes = sizeof(sizes) / sizeof(sizes[0]);
+	for (size_t i = 0; i < num_sizes; i++) {
+		String feature_name = vformat("screen/support_%s", sizes[i]);
+		String feature_support = bool_to_string(p_preset->get(feature_name));
+		String xml_entry = vformat("\n        android:%sScreens=\"%s\"", sizes[i], feature_support);
+		manifest_screen_sizes += xml_entry;
+	}
+	manifest_screen_sizes += " />\n";
+	return manifest_screen_sizes;
+}
+
+String _get_xr_features_tag(const Ref<EditorExportPreset> &p_preset) {
+	String manifest_xr_features;
+	bool uses_xr = (int)(p_preset->get("xr_features/xr_mode")) == 1;
+	if (uses_xr) {
+		int hand_tracking_index = p_preset->get("xr_features/hand_tracking"); // 0: none, 1: optional, 2: required
+		if (hand_tracking_index == 1) {
+			manifest_xr_features += "    <uses-feature tools:node=\"replace\" android:name=\"oculus.software.handtracking\" android:required=\"false\" />\n";
+		} else if (hand_tracking_index == 2) {
+			manifest_xr_features += "    <uses-feature tools:node=\"replace\" android:name=\"oculus.software.handtracking\" android:required=\"true\" />\n";
+		}
+	}
+	return manifest_xr_features;
+}
+
+String _get_instrumentation_tag(const Ref<EditorExportPreset> &p_preset) {
+	String package_name = p_preset->get("package/unique_name");
+	String manifest_instrumentation_text = vformat(
+			"    <instrumentation\n"
+			"        tools:node=\"replace\"\n"
+			"        android:name=\".GodotInstrumentation\"\n"
+			"        android:icon=\"@mipmap/icon\"\n"
+			"        android:label=\"@string/godot_project_name_string\"\n"
+			"        android:targetPackage=\"%s\" />\n",
+			package_name);
+	return manifest_instrumentation_text;
+}
+
+String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) {
+	bool uses_xr = (int)(p_preset->get("xr_features/xr_mode")) == 1;
+	String orientation = _get_android_orientation_label(DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation"))));
+	String manifest_activity_text = vformat(
+			"        <activity android:name=\"com.godot.game.GodotApp\" "
+			"tools:replace=\"android:screenOrientation\" "
+			"android:screenOrientation=\"%s\">\n",
+			orientation);
+	if (!uses_xr) {
+		manifest_activity_text += "            <meta-data tools:node=\"remove\" android:name=\"com.oculus.vr.focusaware\" />\n";
+	}
+	manifest_activity_text += "        </activity>\n";
+	return manifest_activity_text;
+}
+
+String _get_application_tag(const Ref<EditorExportPreset> &p_preset) {
+	String manifest_application_text = vformat(
+			"    <application android:label=\"@string/godot_project_name_string\"\n"
+			"        android:allowBackup=\"%s\"\n"
+			"        android:icon=\"@mipmap/icon\"\n"
+			"        android:isGame=\"%s\"\n"
+			"        tools:replace=\"android:allowBackup,android:isGame\"\n"
+			"        tools:ignore=\"GoogleAppIndexingWarning\">\n\n",
+			bool_to_string(p_preset->get("user_data_backup/allow")),
+			bool_to_string(p_preset->get("package/classify_as_game")));
+
+	manifest_application_text += _get_activity_tag(p_preset);
+	manifest_application_text += "    </application>\n";
+	return manifest_application_text;
+}
diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h
index 52a7e4c5cf..44e9a1727d 100644
--- a/platform/android/export/gradle_export_util.h
+++ b/platform/android/export/gradle_export_util.h
@@ -44,225 +44,43 @@ const String godot_project_name_xml_string = R"(<?xml version="1.0" encoding="ut
 </resources>
 )";
 
-int _get_android_orientation_value(DisplayServer::ScreenOrientation screen_orientation) {
-	switch (screen_orientation) {
-		case DisplayServer::SCREEN_PORTRAIT:
-			return 1;
-		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
-			return 8;
-		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
-			return 9;
-		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
-			return 11;
-		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
-			return 12;
-		case DisplayServer::SCREEN_SENSOR:
-			return 13;
-		case DisplayServer::SCREEN_LANDSCAPE:
-		default:
-			return 0;
-	}
-}
+int _get_android_orientation_value(DisplayServer::ScreenOrientation screen_orientation);
 
-String _get_android_orientation_label(DisplayServer::ScreenOrientation screen_orientation) {
-	switch (screen_orientation) {
-		case DisplayServer::SCREEN_PORTRAIT:
-			return "portrait";
-		case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
-			return "reverseLandscape";
-		case DisplayServer::SCREEN_REVERSE_PORTRAIT:
-			return "reversePortrait";
-		case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
-			return "userLandscape";
-		case DisplayServer::SCREEN_SENSOR_PORTRAIT:
-			return "userPortrait";
-		case DisplayServer::SCREEN_SENSOR:
-			return "fullUser";
-		case DisplayServer::SCREEN_LANDSCAPE:
-		default:
-			return "landscape";
-	}
-}
+String _get_android_orientation_label(DisplayServer::ScreenOrientation screen_orientation);
 
 // Utility method used to create a directory.
-Error create_directory(const String &p_dir) {
-	if (!DirAccess::exists(p_dir)) {
-		DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-		ERR_FAIL_COND_V_MSG(!filesystem_da, ERR_CANT_CREATE, "Cannot create directory '" + p_dir + "'.");
-		Error err = filesystem_da->make_dir_recursive(p_dir);
-		ERR_FAIL_COND_V_MSG(err, ERR_CANT_CREATE, "Cannot create directory '" + p_dir + "'.");
-		memdelete(filesystem_da);
-	}
-	return OK;
-}
+Error create_directory(const String &p_dir);
 
 // Writes p_data into a file at p_path, creating directories if necessary.
 // Note: this will overwrite the file at p_path if it already exists.
-Error store_file_at_path(const String &p_path, const Vector<uint8_t> &p_data) {
-	String dir = p_path.get_base_dir();
-	Error err = create_directory(dir);
-	if (err != OK) {
-		return err;
-	}
-	FileAccess *fa = FileAccess::open(p_path, FileAccess::WRITE);
-	ERR_FAIL_COND_V_MSG(!fa, ERR_CANT_CREATE, "Cannot create file '" + p_path + "'.");
-	fa->store_buffer(p_data.ptr(), p_data.size());
-	memdelete(fa);
-	return OK;
-}
+Error store_file_at_path(const String &p_path, const Vector<uint8_t> &p_data);
 
 // Writes string p_data into a file at p_path, creating directories if necessary.
 // Note: this will overwrite the file at p_path if it already exists.
-Error store_string_at_path(const String &p_path, const String &p_data) {
-	String dir = p_path.get_base_dir();
-	Error err = create_directory(dir);
-	if (err != OK) {
-		if (OS::get_singleton()->is_stdout_verbose()) {
-			print_error("Unable to write data into " + p_path);
-		}
-		return err;
-	}
-	FileAccess *fa = FileAccess::open(p_path, FileAccess::WRITE);
-	ERR_FAIL_COND_V_MSG(!fa, ERR_CANT_CREATE, "Cannot create file '" + p_path + "'.");
-	fa->store_string(p_data);
-	memdelete(fa);
-	return OK;
-}
+Error store_string_at_path(const String &p_path, const String &p_data);
 
 // Implementation of EditorExportSaveFunction.
 // This method will only be called as an input to export_project_files.
 // It is used by the export_project_files method to save all the asset files into the gradle project.
 // It's functionality mirrors that of the method save_apk_file.
 // This method will be called ONLY when custom build is enabled.
-Error rename_and_store_file_in_gradle_project(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) {
-	String dst_path = p_path.replace_first("res://", "res://android/build/assets/");
-	print_verbose("Saving project files from " + p_path + " into " + dst_path);
-	Error err = store_file_at_path(dst_path, p_data);
-	return err;
-}
+Error rename_and_store_file_in_gradle_project(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);
 
 // Creates strings.xml files inside the gradle project for different locales.
-Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name) {
-	print_verbose("Creating strings resources for supported locales for project " + project_name);
-	// Stores the string into the default values directory.
-	String processed_default_xml_string = vformat(godot_project_name_xml_string, project_name.xml_escape(true));
-	store_string_at_path("res://android/build/res/values/godot_project_name_string.xml", processed_default_xml_string);
+Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name);
 
-	// Searches the Gradle project res/ directory to find all supported locales
-	DirAccessRef da = DirAccess::open("res://android/build/res");
-	if (!da) {
-		if (OS::get_singleton()->is_stdout_verbose()) {
-			print_error("Unable to open Android resources directory.");
-		}
-		return ERR_CANT_OPEN;
-	}
-	da->list_dir_begin();
-	while (true) {
-		String file = da->get_next();
-		if (file == "") {
-			break;
-		}
-		if (!file.begins_with("values-")) {
-			// NOTE: This assumes all directories that start with "values-" are for localization.
-			continue;
-		}
-		String locale = file.replace("values-", "").replace("-r", "_");
-		String property_name = "application/config/name_" + locale;
-		String locale_directory = "res://android/build/res/" + file + "/godot_project_name_string.xml";
-		if (ProjectSettings::get_singleton()->has_setting(property_name)) {
-			String locale_project_name = ProjectSettings::get_singleton()->get(property_name);
-			String processed_xml_string = vformat(godot_project_name_xml_string, locale_project_name.xml_escape(true));
-			print_verbose("Storing project name for locale " + locale + " under " + locale_directory);
-			store_string_at_path(locale_directory, processed_xml_string);
-		} else {
-			// TODO: Once the legacy build system is deprecated we don't need to have xml files for this else branch
-			store_string_at_path(locale_directory, processed_default_xml_string);
-		}
-	}
-	da->list_dir_end();
-	return OK;
-}
+String bool_to_string(bool v);
 
-String bool_to_string(bool v) {
-	return v ? "true" : "false";
-}
+String _get_gles_tag();
 
-String _get_gles_tag() {
-	bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/driver/driver_name") == "GLES3" &&
-					 !ProjectSettings::get_singleton()->get("rendering/driver/fallback_to_gles2");
-	return min_gles3 ? "    <uses-feature android:glEsVersion=\"0x00030000\" android:required=\"true\" />\n" : "";
-}
+String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset);
 
-String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset) {
-	String manifest_screen_sizes = "    <supports-screens \n        tools:node=\"replace\"";
-	String sizes[] = { "small", "normal", "large", "xlarge" };
-	size_t num_sizes = sizeof(sizes) / sizeof(sizes[0]);
-	for (size_t i = 0; i < num_sizes; i++) {
-		String feature_name = vformat("screen/support_%s", sizes[i]);
-		String feature_support = bool_to_string(p_preset->get(feature_name));
-		String xml_entry = vformat("\n        android:%sScreens=\"%s\"", sizes[i], feature_support);
-		manifest_screen_sizes += xml_entry;
-	}
-	manifest_screen_sizes += " />\n";
-	return manifest_screen_sizes;
-}
+String _get_xr_features_tag(const Ref<EditorExportPreset> &p_preset);
 
-String _get_xr_features_tag(const Ref<EditorExportPreset> &p_preset) {
-	String manifest_xr_features;
-	bool uses_xr = (int)(p_preset->get("xr_features/xr_mode")) == 1;
-	if (uses_xr) {
-		int hand_tracking_index = p_preset->get("xr_features/hand_tracking"); // 0: none, 1: optional, 2: required
-		if (hand_tracking_index == 1) {
-			manifest_xr_features += "    <uses-feature tools:node=\"replace\" android:name=\"oculus.software.handtracking\" android:required=\"false\" />\n";
-		} else if (hand_tracking_index == 2) {
-			manifest_xr_features += "    <uses-feature tools:node=\"replace\" android:name=\"oculus.software.handtracking\" android:required=\"true\" />\n";
-		}
-	}
-	return manifest_xr_features;
-}
+String _get_instrumentation_tag(const Ref<EditorExportPreset> &p_preset);
 
-String _get_instrumentation_tag(const Ref<EditorExportPreset> &p_preset) {
-	String package_name = p_preset->get("package/unique_name");
-	String manifest_instrumentation_text = vformat(
-			"    <instrumentation\n"
-			"        tools:node=\"replace\"\n"
-			"        android:name=\".GodotInstrumentation\"\n"
-			"        android:icon=\"@mipmap/icon\"\n"
-			"        android:label=\"@string/godot_project_name_string\"\n"
-			"        android:targetPackage=\"%s\" />\n",
-			package_name);
-	return manifest_instrumentation_text;
-}
+String _get_activity_tag(const Ref<EditorExportPreset> &p_preset);
 
-String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) {
-	bool uses_xr = (int)(p_preset->get("xr_features/xr_mode")) == 1;
-	String orientation = _get_android_orientation_label(DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation"))));
-	String manifest_activity_text = vformat(
-			"        <activity android:name=\"com.godot.game.GodotApp\" "
-			"tools:replace=\"android:screenOrientation\" "
-			"android:screenOrientation=\"%s\">\n",
-			orientation);
-	if (!uses_xr) {
-		manifest_activity_text += "            <meta-data tools:node=\"remove\" android:name=\"com.oculus.vr.focusaware\" />\n";
-	}
-	manifest_activity_text += "        </activity>\n";
-	return manifest_activity_text;
-}
-
-String _get_application_tag(const Ref<EditorExportPreset> &p_preset) {
-	String manifest_application_text = vformat(
-			"    <application android:label=\"@string/godot_project_name_string\"\n"
-			"        android:allowBackup=\"%s\"\n"
-			"        android:icon=\"@mipmap/icon\"\n"
-			"        android:isGame=\"%s\"\n"
-			"        tools:replace=\"android:allowBackup,android:isGame\"\n"
-			"        tools:ignore=\"GoogleAppIndexingWarning\">\n\n",
-			bool_to_string(p_preset->get("user_data_backup/allow")),
-			bool_to_string(p_preset->get("package/classify_as_game")));
-
-	manifest_application_text += _get_activity_tag(p_preset);
-	manifest_application_text += "    </application>\n";
-	return manifest_application_text;
-}
+String _get_application_tag(const Ref<EditorExportPreset> &p_preset);
 
 #endif //GODOT_GRADLE_EXPORT_UTIL_H
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp
index f21a14e84b..208626ae36 100644
--- a/platform/iphone/export/export.cpp
+++ b/platform/iphone/export/export.cpp
@@ -30,2027 +30,7 @@
 
 #include "export.h"
 
-#include "core/config/project_settings.h"
-#include "core/io/file_access.h"
-#include "core/io/image_loader.h"
-#include "core/io/marshalls.h"
-#include "core/io/resource_saver.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
-#include "core/templates/safe_refcount.h"
-#include "core/version.h"
-#include "editor/editor_export.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "main/splash.gen.h"
-#include "platform/iphone/logo.gen.h"
-#include "platform/iphone/plugin/godot_plugin_config.h"
-#include "string.h"
-
-#include <sys/stat.h>
-
-class EditorExportPlatformIOS : public EditorExportPlatform {
-	GDCLASS(EditorExportPlatformIOS, EditorExportPlatform);
-
-	int version_code;
-
-	Ref<ImageTexture> logo;
-
-	// Plugins
-	SafeFlag plugins_changed;
-	Thread check_for_changes_thread;
-	SafeFlag quit_request;
-	Mutex plugins_lock;
-	Vector<PluginConfigIOS> plugins;
-
-	typedef Error (*FileHandler)(String p_file, void *p_userdata);
-	static Error _walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata);
-	static Error _codesign(String p_file, void *p_userdata);
-	void _blend_and_rotate(Ref<Image> &p_dst, Ref<Image> &p_src, bool p_rot);
-
-	struct IOSConfigData {
-		String pkg_name;
-		String binary_name;
-		String plist_content;
-		String architectures;
-		String linker_flags;
-		String cpp_code;
-		String modules_buildfile;
-		String modules_fileref;
-		String modules_buildphase;
-		String modules_buildgrp;
-		Vector<String> capabilities;
-	};
-	struct ExportArchitecture {
-		String name;
-		bool is_default = false;
-
-		ExportArchitecture() {}
-
-		ExportArchitecture(String p_name, bool p_is_default) {
-			name = p_name;
-			is_default = p_is_default;
-		}
-	};
-
-	struct IOSExportAsset {
-		String exported_path;
-		bool is_framework = false; // framework is anything linked to the binary, otherwise it's a resource
-		bool should_embed = false;
-	};
-
-	String _get_additional_plist_content();
-	String _get_linker_flags();
-	String _get_cpp_code();
-	void _fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const IOSConfigData &p_config, bool p_debug);
-	Error _export_loading_screen_images(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir);
-	Error _export_loading_screen_file(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir);
-	Error _export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir);
-
-	Vector<ExportArchitecture> _get_supported_architectures();
-	Vector<String> _get_preset_architectures(const Ref<EditorExportPreset> &p_preset);
-
-	void _add_assets_to_project(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_project_data, const Vector<IOSExportAsset> &p_additional_assets);
-	Error _export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets);
-	Error _copy_asset(const String &p_out_dir, const String &p_asset, const String *p_custom_file_name, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets);
-	Error _export_additional_assets(const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<IOSExportAsset> &r_exported_assets);
-	Error _export_ios_plugins(const Ref<EditorExportPreset> &p_preset, IOSConfigData &p_config_data, const String &dest_dir, Vector<IOSExportAsset> &r_exported_assets, bool p_debug);
-
-	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const {
-		String pname = p_package;
-
-		if (pname.length() == 0) {
-			if (r_error) {
-				*r_error = TTR("Identifier is missing.");
-			}
-			return false;
-		}
-
-		for (int i = 0; i < pname.length(); i++) {
-			char32_t c = pname[i];
-			if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) {
-				if (r_error) {
-					*r_error = vformat(TTR("The character '%s' is not allowed in Identifier."), String::chr(c));
-				}
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	static void _check_for_changes_poll_thread(void *ud) {
-		EditorExportPlatformIOS *ea = (EditorExportPlatformIOS *)ud;
-
-		while (!ea->quit_request.is_set()) {
-			// Nothing to do if we already know the plugins have changed.
-			if (!ea->plugins_changed.is_set()) {
-				MutexLock lock(ea->plugins_lock);
-
-				Vector<PluginConfigIOS> loaded_plugins = get_plugins();
-
-				if (ea->plugins.size() != loaded_plugins.size()) {
-					ea->plugins_changed.set();
-				} else {
-					for (int i = 0; i < ea->plugins.size(); i++) {
-						if (ea->plugins[i].name != loaded_plugins[i].name || ea->plugins[i].last_updated != loaded_plugins[i].last_updated) {
-							ea->plugins_changed.set();
-							break;
-						}
-					}
-				}
-			}
-
-			uint64_t wait = 3000000;
-			uint64_t time = OS::get_singleton()->get_ticks_usec();
-			while (OS::get_singleton()->get_ticks_usec() - time < wait) {
-				OS::get_singleton()->delay_usec(300000);
-
-				if (ea->quit_request.is_set()) {
-					break;
-				}
-			}
-		}
-	}
-
-protected:
-	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
-	virtual void get_export_options(List<ExportOption> *r_options) override;
-
-public:
-	virtual String get_name() const override { return "iOS"; }
-	virtual String get_os_name() const override { return "iOS"; }
-	virtual Ref<Texture2D> get_logo() const override { return logo; }
-
-	virtual bool should_update_export_options() override {
-		bool export_options_changed = plugins_changed.is_set();
-		if (export_options_changed) {
-			// don't clear unless we're reporting true, to avoid race
-			plugins_changed.clear();
-		}
-		return export_options_changed;
-	}
-
-	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override {
-		List<String> list;
-		list.push_back("ipa");
-		return list;
-	}
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
-
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
-
-	virtual void get_platform_features(List<String> *r_features) override {
-		r_features->push_back("mobile");
-		r_features->push_back("iOS");
-	}
-
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
-	}
-
-	EditorExportPlatformIOS();
-	~EditorExportPlatformIOS();
-
-	/// List the gdip files in the directory specified by the p_path parameter.
-	static Vector<String> list_plugin_config_files(const String &p_path, bool p_check_directories) {
-		Vector<String> dir_files;
-		DirAccessRef da = DirAccess::open(p_path);
-		if (da) {
-			da->list_dir_begin();
-			while (true) {
-				String file = da->get_next();
-				if (file.is_empty()) {
-					break;
-				}
-
-				if (file == "." || file == "..") {
-					continue;
-				}
-
-				if (da->current_is_hidden()) {
-					continue;
-				}
-
-				if (da->current_is_dir()) {
-					if (p_check_directories) {
-						Vector<String> directory_files = list_plugin_config_files(p_path.plus_file(file), false);
-						for (int i = 0; i < directory_files.size(); ++i) {
-							dir_files.push_back(file.plus_file(directory_files[i]));
-						}
-					}
-
-					continue;
-				}
-
-				if (file.ends_with(PluginConfigIOS::PLUGIN_CONFIG_EXT)) {
-					dir_files.push_back(file);
-				}
-			}
-			da->list_dir_end();
-		}
-
-		return dir_files;
-	}
-
-	static Vector<PluginConfigIOS> get_plugins() {
-		Vector<PluginConfigIOS> loaded_plugins;
-
-		String plugins_dir = ProjectSettings::get_singleton()->get_resource_path().plus_file("ios/plugins");
-
-		if (DirAccess::exists(plugins_dir)) {
-			Vector<String> plugins_filenames = list_plugin_config_files(plugins_dir, true);
-
-			if (!plugins_filenames.is_empty()) {
-				Ref<ConfigFile> config_file = memnew(ConfigFile);
-				for (int i = 0; i < plugins_filenames.size(); i++) {
-					PluginConfigIOS config = load_plugin_config(config_file, plugins_dir.plus_file(plugins_filenames[i]));
-					if (config.valid_config) {
-						loaded_plugins.push_back(config);
-					} else {
-						print_error("Invalid plugin config file " + plugins_filenames[i]);
-					}
-				}
-			}
-		}
-
-		return loaded_plugins;
-	}
-
-	static Vector<PluginConfigIOS> get_enabled_plugins(const Ref<EditorExportPreset> &p_presets) {
-		Vector<PluginConfigIOS> enabled_plugins;
-		Vector<PluginConfigIOS> all_plugins = get_plugins();
-		for (int i = 0; i < all_plugins.size(); i++) {
-			PluginConfigIOS plugin = all_plugins[i];
-			bool enabled = p_presets->get("plugins/" + plugin.name);
-			if (enabled) {
-				enabled_plugins.push_back(plugin);
-			}
-		}
-
-		return enabled_plugins;
-	}
-};
-
-void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
-	String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
-	r_features->push_back("pvrtc");
-	if (driver == "Vulkan") {
-		// FIXME: Review if this is correct.
-		r_features->push_back("etc2");
-	}
-
-	Vector<String> architectures = _get_preset_architectures(p_preset);
-	for (int i = 0; i < architectures.size(); ++i) {
-		r_features->push_back(architectures[i]);
-	}
-}
-
-Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() {
-	Vector<ExportArchitecture> archs;
-	archs.push_back(ExportArchitecture("armv7", false)); // Disabled by default, not included in official templates.
-	archs.push_back(ExportArchitecture("arm64", true));
-	return archs;
-}
-
-struct LoadingScreenInfo {
-	const char *preset_key;
-	const char *export_name;
-	int width = 0;
-	int height = 0;
-	bool rotate = false;
-};
-
-static const LoadingScreenInfo loading_screen_infos[] = {
-	{ "landscape_launch_screens/iphone_2436x1125", "Default-Landscape-X.png", 2436, 1125, false },
-	{ "landscape_launch_screens/iphone_2208x1242", "Default-Landscape-736h@3x.png", 2208, 1242, false },
-	{ "landscape_launch_screens/ipad_1024x768", "Default-Landscape.png", 1024, 768, false },
-	{ "landscape_launch_screens/ipad_2048x1536", "Default-Landscape@2x.png", 2048, 1536, false },
-
-	{ "portrait_launch_screens/iphone_640x960", "Default-480h@2x.png", 640, 960, true },
-	{ "portrait_launch_screens/iphone_640x1136", "Default-568h@2x.png", 640, 1136, true },
-	{ "portrait_launch_screens/iphone_750x1334", "Default-667h@2x.png", 750, 1334, true },
-	{ "portrait_launch_screens/iphone_1125x2436", "Default-Portrait-X.png", 1125, 2436, true },
-	{ "portrait_launch_screens/ipad_768x1024", "Default-Portrait.png", 768, 1024, true },
-	{ "portrait_launch_screens/ipad_1536x2048", "Default-Portrait@2x.png", 1536, 2048, true },
-	{ "portrait_launch_screens/iphone_1242x2208", "Default-Portrait-736h@3x.png", 1242, 2208, true }
-};
-
-void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) {
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-
-	Vector<ExportArchitecture> architectures = _get_supported_architectures();
-	for (int i = 0; i < architectures.size(); ++i) {
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + architectures[i].name), architectures[i].is_default));
-	}
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/app_store_team_id"), ""));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/provisioning_profile_uuid_debug"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_debug", PROPERTY_HINT_PLACEHOLDER_TEXT, "iPhone Developer"), "iPhone Developer"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_debug", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 1));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/provisioning_profile_uuid_release"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_release", PROPERTY_HINT_PLACEHOLDER_TEXT, "iPhone Distribution"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_release", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 0));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/targeted_device_family", PROPERTY_HINT_ENUM, "iPhone,iPad,iPhone & iPad"), 2));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/bundle_identifier", PROPERTY_HINT_PLACEHOLDER_TEXT, "com.example.game"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/signature"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version"), "1.0"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version"), "1.0"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
-
-	Vector<PluginConfigIOS> found_plugins = get_plugins();
-	for (int i = 0; i < found_plugins.size(); i++) {
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "plugins/" + found_plugins[i].name), false));
-	}
-
-	Set<String> plist_keys;
-
-	for (int i = 0; i < found_plugins.size(); i++) {
-		// Editable plugin plist values
-		PluginConfigIOS plugin = found_plugins[i];
-		const String *K = nullptr;
-
-		while ((K = plugin.plist.next(K))) {
-			String key = *K;
-			PluginConfigIOS::PlistItem item = plugin.plist[key];
-			switch (item.type) {
-				case PluginConfigIOS::PlistItemType::STRING_INPUT: {
-					String preset_name = "plugins_plist/" + key;
-					if (!plist_keys.has(preset_name)) {
-						r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, preset_name), item.value));
-						plist_keys.insert(preset_name);
-					}
-				} break;
-				default:
-					continue;
-			}
-		}
-	}
-
-	plugins_changed.clear();
-	plugins = found_plugins;
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/access_wifi"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/push_notifications"), false));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data/accessible_from_files_app"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data/accessible_from_itunes_sharing"), false));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/camera_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the camera"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/microphone_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the microphone"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/photolibrary_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need access to the photo library"), ""));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "icons/generate_missing"), false));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/iphone_120x120", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPhone/iPod Touch with retina display
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/ipad_76x76", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPad
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/app_store_1024x1024", PROPERTY_HINT_FILE, "*.png"), "")); // App Store
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/iphone_180x180", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPhone with retina HD display
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/ipad_152x152", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPad with retina display
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/ipad_167x167", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPad Pro
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/spotlight_40x40", PROPERTY_HINT_FILE, "*.png"), "")); // Spotlight
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/spotlight_80x80", PROPERTY_HINT_FILE, "*.png"), "")); // Spotlight on devices with retina display
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "storyboard/use_launch_screen_storyboard"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "storyboard/image_scale_mode", PROPERTY_HINT_ENUM, "Same as Logo,Center,Scale to Fit,Scale to Fill,Scale"), 0));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@2x", PROPERTY_HINT_FILE, "*.png"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@3x", PROPERTY_HINT_FILE, "*.png"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "storyboard/use_custom_bg_color"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::COLOR, "storyboard/custom_bg_color"), Color()));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "launch_screens/generate_missing"), false));
-
-	for (uint64_t i = 0; i < sizeof(loading_screen_infos) / sizeof(loading_screen_infos[0]); ++i) {
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, loading_screen_infos[i].preset_key, PROPERTY_HINT_FILE, "*.png"), ""));
-	}
-}
-
-void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const IOSConfigData &p_config, bool p_debug) {
-	static const String export_method_string[] = {
-		"app-store",
-		"development",
-		"ad-hoc",
-		"enterprise"
-	};
-	static const String storyboard_image_scale_mode[] = {
-		"center",
-		"scaleAspectFit",
-		"scaleAspectFill",
-		"scaleToFill"
-	};
-	String str;
-	String strnew;
-	str.parse_utf8((const char *)pfile.ptr(), pfile.size());
-	Vector<String> lines = str.split("\n");
-	for (int i = 0; i < lines.size(); i++) {
-		if (lines[i].find("$binary") != -1) {
-			strnew += lines[i].replace("$binary", p_config.binary_name) + "\n";
-		} else if (lines[i].find("$modules_buildfile") != -1) {
-			strnew += lines[i].replace("$modules_buildfile", p_config.modules_buildfile) + "\n";
-		} else if (lines[i].find("$modules_fileref") != -1) {
-			strnew += lines[i].replace("$modules_fileref", p_config.modules_fileref) + "\n";
-		} else if (lines[i].find("$modules_buildphase") != -1) {
-			strnew += lines[i].replace("$modules_buildphase", p_config.modules_buildphase) + "\n";
-		} else if (lines[i].find("$modules_buildgrp") != -1) {
-			strnew += lines[i].replace("$modules_buildgrp", p_config.modules_buildgrp) + "\n";
-		} else if (lines[i].find("$name") != -1) {
-			strnew += lines[i].replace("$name", p_config.pkg_name) + "\n";
-		} else if (lines[i].find("$info") != -1) {
-			strnew += lines[i].replace("$info", p_preset->get("application/info")) + "\n";
-		} else if (lines[i].find("$bundle_identifier") != -1) {
-			strnew += lines[i].replace("$bundle_identifier", p_preset->get("application/bundle_identifier")) + "\n";
-		} else if (lines[i].find("$short_version") != -1) {
-			strnew += lines[i].replace("$short_version", p_preset->get("application/short_version")) + "\n";
-		} else if (lines[i].find("$version") != -1) {
-			strnew += lines[i].replace("$version", p_preset->get("application/version")) + "\n";
-		} else if (lines[i].find("$signature") != -1) {
-			strnew += lines[i].replace("$signature", p_preset->get("application/signature")) + "\n";
-		} else if (lines[i].find("$copyright") != -1) {
-			strnew += lines[i].replace("$copyright", p_preset->get("application/copyright")) + "\n";
-		} else if (lines[i].find("$team_id") != -1) {
-			strnew += lines[i].replace("$team_id", p_preset->get("application/app_store_team_id")) + "\n";
-		} else if (lines[i].find("$default_build_config") != -1) {
-			strnew += lines[i].replace("$default_build_config", p_debug ? "Debug" : "Release") + "\n";
-		} else if (lines[i].find("$export_method") != -1) {
-			int export_method = p_preset->get(p_debug ? "application/export_method_debug" : "application/export_method_release");
-			strnew += lines[i].replace("$export_method", export_method_string[export_method]) + "\n";
-		} else if (lines[i].find("$provisioning_profile_uuid_release") != -1) {
-			strnew += lines[i].replace("$provisioning_profile_uuid_release", p_preset->get("application/provisioning_profile_uuid_release")) + "\n";
-		} else if (lines[i].find("$provisioning_profile_uuid_debug") != -1) {
-			strnew += lines[i].replace("$provisioning_profile_uuid_debug", p_preset->get("application/provisioning_profile_uuid_debug")) + "\n";
-		} else if (lines[i].find("$provisioning_profile_uuid") != -1) {
-			String uuid = p_debug ? p_preset->get("application/provisioning_profile_uuid_debug") : p_preset->get("application/provisioning_profile_uuid_release");
-			strnew += lines[i].replace("$provisioning_profile_uuid", uuid) + "\n";
-		} else if (lines[i].find("$code_sign_identity_debug") != -1) {
-			strnew += lines[i].replace("$code_sign_identity_debug", p_preset->get("application/code_sign_identity_debug")) + "\n";
-		} else if (lines[i].find("$code_sign_identity_release") != -1) {
-			strnew += lines[i].replace("$code_sign_identity_release", p_preset->get("application/code_sign_identity_release")) + "\n";
-		} else if (lines[i].find("$additional_plist_content") != -1) {
-			strnew += lines[i].replace("$additional_plist_content", p_config.plist_content) + "\n";
-		} else if (lines[i].find("$godot_archs") != -1) {
-			strnew += lines[i].replace("$godot_archs", p_config.architectures) + "\n";
-		} else if (lines[i].find("$linker_flags") != -1) {
-			strnew += lines[i].replace("$linker_flags", p_config.linker_flags) + "\n";
-		} else if (lines[i].find("$targeted_device_family") != -1) {
-			String xcode_value;
-			switch ((int)p_preset->get("application/targeted_device_family")) {
-				case 0: // iPhone
-					xcode_value = "1";
-					break;
-				case 1: // iPad
-					xcode_value = "2";
-					break;
-				case 2: // iPhone & iPad
-					xcode_value = "1,2";
-					break;
-			}
-			strnew += lines[i].replace("$targeted_device_family", xcode_value) + "\n";
-		} else if (lines[i].find("$cpp_code") != -1) {
-			strnew += lines[i].replace("$cpp_code", p_config.cpp_code) + "\n";
-		} else if (lines[i].find("$docs_in_place") != -1) {
-			strnew += lines[i].replace("$docs_in_place", ((bool)p_preset->get("user_data/accessible_from_files_app")) ? "<true/>" : "<false/>") + "\n";
-		} else if (lines[i].find("$docs_sharing") != -1) {
-			strnew += lines[i].replace("$docs_sharing", ((bool)p_preset->get("user_data/accessible_from_itunes_sharing")) ? "<true/>" : "<false/>") + "\n";
-		} else if (lines[i].find("$entitlements_push_notifications") != -1) {
-			bool is_on = p_preset->get("capabilities/push_notifications");
-			strnew += lines[i].replace("$entitlements_push_notifications", is_on ? "<key>aps-environment</key><string>development</string>" : "") + "\n";
-		} else if (lines[i].find("$required_device_capabilities") != -1) {
-			String capabilities;
-
-			// I've removed armv7 as we can run on 64bit only devices
-			// Note that capabilities listed here are requirements for the app to be installed.
-			// They don't enable anything.
-			Vector<String> capabilities_list = p_config.capabilities;
-
-			if ((bool)p_preset->get("capabilities/access_wifi") && !capabilities_list.has("wifi")) {
-				capabilities_list.push_back("wifi");
-			}
-
-			for (int idx = 0; idx < capabilities_list.size(); idx++) {
-				capabilities += "<string>" + capabilities_list[idx] + "</string>\n";
-			}
-
-			strnew += lines[i].replace("$required_device_capabilities", capabilities);
-		} else if (lines[i].find("$interface_orientations") != -1) {
-			String orientations;
-			const DisplayServer::ScreenOrientation screen_orientation =
-					DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation")));
-
-			switch (screen_orientation) {
-				case DisplayServer::SCREEN_LANDSCAPE:
-					orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
-					break;
-				case DisplayServer::SCREEN_PORTRAIT:
-					orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
-					break;
-				case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
-					orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
-					break;
-				case DisplayServer::SCREEN_REVERSE_PORTRAIT:
-					orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
-					break;
-				case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
-					// Allow both landscape orientations depending on sensor direction.
-					orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
-					orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
-					break;
-				case DisplayServer::SCREEN_SENSOR_PORTRAIT:
-					// Allow both portrait orientations depending on sensor direction.
-					orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
-					orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
-					break;
-				case DisplayServer::SCREEN_SENSOR:
-					// Allow all screen orientations depending on sensor direction.
-					orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
-					orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
-					orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
-					orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
-					break;
-			}
-
-			strnew += lines[i].replace("$interface_orientations", orientations);
-		} else if (lines[i].find("$camera_usage_description") != -1) {
-			String description = p_preset->get("privacy/camera_usage_description");
-			strnew += lines[i].replace("$camera_usage_description", description) + "\n";
-		} else if (lines[i].find("$microphone_usage_description") != -1) {
-			String description = p_preset->get("privacy/microphone_usage_description");
-			strnew += lines[i].replace("$microphone_usage_description", description) + "\n";
-		} else if (lines[i].find("$photolibrary_usage_description") != -1) {
-			String description = p_preset->get("privacy/photolibrary_usage_description");
-			strnew += lines[i].replace("$photolibrary_usage_description", description) + "\n";
-		} else if (lines[i].find("$plist_launch_screen_name") != -1) {
-			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
-			String value = is_on ? "<key>UILaunchStoryboardName</key>\n<string>Launch Screen</string>" : "";
-			strnew += lines[i].replace("$plist_launch_screen_name", value) + "\n";
-		} else if (lines[i].find("$pbx_launch_screen_file_reference") != -1) {
-			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
-			String value = is_on ? "90DD2D9D24B36E8000717FE1 = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = \"Launch Screen.storyboard\"; sourceTree = \"<group>\"; };" : "";
-			strnew += lines[i].replace("$pbx_launch_screen_file_reference", value) + "\n";
-		} else if (lines[i].find("$pbx_launch_screen_copy_files") != -1) {
-			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
-			String value = is_on ? "90DD2D9D24B36E8000717FE1 /* Launch Screen.storyboard */," : "";
-			strnew += lines[i].replace("$pbx_launch_screen_copy_files", value) + "\n";
-		} else if (lines[i].find("$pbx_launch_screen_build_phase") != -1) {
-			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
-			String value = is_on ? "90DD2D9E24B36E8000717FE1 /* Launch Screen.storyboard in Resources */," : "";
-			strnew += lines[i].replace("$pbx_launch_screen_build_phase", value) + "\n";
-		} else if (lines[i].find("$pbx_launch_screen_build_reference") != -1) {
-			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
-			String value = is_on ? "90DD2D9E24B36E8000717FE1 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 90DD2D9D24B36E8000717FE1 /* Launch Screen.storyboard */; };" : "";
-			strnew += lines[i].replace("$pbx_launch_screen_build_reference", value) + "\n";
-		} else if (lines[i].find("$pbx_launch_image_usage_setting") != -1) {
-			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
-			String value = is_on ? "" : "ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;";
-			strnew += lines[i].replace("$pbx_launch_image_usage_setting", value) + "\n";
-		} else if (lines[i].find("$launch_screen_image_mode") != -1) {
-			int image_scale_mode = p_preset->get("storyboard/image_scale_mode");
-			String value;
-
-			switch (image_scale_mode) {
-				case 0: {
-					String logo_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
-					bool is_on = ProjectSettings::get_singleton()->get("application/boot_splash/fullsize");
-					// If custom logo is not specified, Godot does not scale default one, so we should do the same.
-					value = (is_on && logo_path.length() > 0) ? "scaleAspectFit" : "center";
-				} break;
-				default: {
-					value = storyboard_image_scale_mode[image_scale_mode - 1];
-				}
-			}
-
-			strnew += lines[i].replace("$launch_screen_image_mode", value) + "\n";
-		} else if (lines[i].find("$launch_screen_background_color") != -1) {
-			bool use_custom = p_preset->get("storyboard/use_custom_bg_color");
-			Color color = use_custom ? p_preset->get("storyboard/custom_bg_color") : ProjectSettings::get_singleton()->get("application/boot_splash/bg_color");
-			const String value_format = "red=\"$red\" green=\"$green\" blue=\"$blue\" alpha=\"$alpha\"";
-
-			Dictionary value_dictionary;
-			value_dictionary["red"] = color.r;
-			value_dictionary["green"] = color.g;
-			value_dictionary["blue"] = color.b;
-			value_dictionary["alpha"] = color.a;
-			String value = value_format.format(value_dictionary, "$_");
-
-			strnew += lines[i].replace("$launch_screen_background_color", value) + "\n";
-		} else {
-			strnew += lines[i] + "\n";
-		}
-	}
-
-	// !BAS! I'm assuming the 9 in the original code was a typo. I've added -1 or else it seems to also be adding our terminating zero...
-	// should apply the same fix in our OSX export.
-	CharString cs = strnew.utf8();
-	pfile.resize(cs.size() - 1);
-	for (int i = 0; i < cs.size() - 1; i++) {
-		pfile.write[i] = cs[i];
-	}
-}
-
-String EditorExportPlatformIOS::_get_additional_plist_content() {
-	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
-	String result;
-	for (int i = 0; i < export_plugins.size(); ++i) {
-		result += export_plugins[i]->get_ios_plist_content();
-	}
-	return result;
-}
-
-String EditorExportPlatformIOS::_get_linker_flags() {
-	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
-	String result;
-	for (int i = 0; i < export_plugins.size(); ++i) {
-		String flags = export_plugins[i]->get_ios_linker_flags();
-		if (flags.length() == 0) {
-			continue;
-		}
-		if (result.length() > 0) {
-			result += ' ';
-		}
-		result += flags;
-	}
-	// the flags will be enclosed in quotes, so need to escape them
-	return result.replace("\"", "\\\"");
-}
-
-String EditorExportPlatformIOS::_get_cpp_code() {
-	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
-	String result;
-	for (int i = 0; i < export_plugins.size(); ++i) {
-		result += export_plugins[i]->get_ios_cpp_code();
-	}
-	return result;
-}
-
-void EditorExportPlatformIOS::_blend_and_rotate(Ref<Image> &p_dst, Ref<Image> &p_src, bool p_rot) {
-	ERR_FAIL_COND(p_dst.is_null());
-	ERR_FAIL_COND(p_src.is_null());
-
-	int sw = p_rot ? p_src->get_height() : p_src->get_width();
-	int sh = p_rot ? p_src->get_width() : p_src->get_height();
-
-	int x_pos = (p_dst->get_width() - sw) / 2;
-	int y_pos = (p_dst->get_height() - sh) / 2;
-
-	int xs = (x_pos >= 0) ? 0 : -x_pos;
-	int ys = (y_pos >= 0) ? 0 : -y_pos;
-
-	if (sw + x_pos > p_dst->get_width()) {
-		sw = p_dst->get_width() - x_pos;
-	}
-	if (sh + y_pos > p_dst->get_height()) {
-		sh = p_dst->get_height() - y_pos;
-	}
-
-	for (int y = ys; y < sh; y++) {
-		for (int x = xs; x < sw; x++) {
-			Color sc = p_rot ? p_src->get_pixel(p_src->get_width() - y - 1, x) : p_src->get_pixel(x, y);
-			Color dc = p_dst->get_pixel(x_pos + x, y_pos + y);
-			dc.r = (double)(sc.a * sc.r + dc.a * (1.0 - sc.a) * dc.r);
-			dc.g = (double)(sc.a * sc.g + dc.a * (1.0 - sc.a) * dc.g);
-			dc.b = (double)(sc.a * sc.b + dc.a * (1.0 - sc.a) * dc.b);
-			dc.a = (double)(sc.a + dc.a * (1.0 - sc.a));
-			p_dst->set_pixel(x_pos + x, y_pos + y, dc);
-		}
-	}
-}
-
-struct IconInfo {
-	const char *preset_key;
-	const char *idiom;
-	const char *export_name;
-	const char *actual_size_side;
-	const char *scale;
-	const char *unscaled_size;
-	bool is_required = false;
-};
-
-static const IconInfo icon_infos[] = {
-	{ "required_icons/iphone_120x120", "iphone", "Icon-120.png", "120", "2x", "60x60", true },
-	{ "required_icons/iphone_120x120", "iphone", "Icon-120.png", "120", "3x", "40x40", true },
-
-	{ "required_icons/ipad_76x76", "ipad", "Icon-76.png", "76", "1x", "76x76", true },
-	{ "required_icons/app_store_1024x1024", "ios-marketing", "Icon-1024.png", "1024", "1x", "1024x1024", true },
-
-	{ "optional_icons/iphone_180x180", "iphone", "Icon-180.png", "180", "3x", "60x60", false },
-
-	{ "optional_icons/ipad_152x152", "ipad", "Icon-152.png", "152", "2x", "76x76", false },
-
-	{ "optional_icons/ipad_167x167", "ipad", "Icon-167.png", "167", "2x", "83.5x83.5", false },
-
-	{ "optional_icons/spotlight_40x40", "ipad", "Icon-40.png", "40", "1x", "40x40", false },
-
-	{ "optional_icons/spotlight_80x80", "iphone", "Icon-80.png", "80", "2x", "40x40", false },
-	{ "optional_icons/spotlight_80x80", "ipad", "Icon-80.png", "80", "2x", "40x40", false }
-};
-
-Error EditorExportPlatformIOS::_export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir) {
-	String json_description = "{\"images\":[";
-	String sizes;
-
-	DirAccess *da = DirAccess::open(p_iconset_dir);
-	ERR_FAIL_COND_V_MSG(!da, ERR_CANT_OPEN, "Cannot open directory '" + p_iconset_dir + "'.");
-
-	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
-		IconInfo info = icon_infos[i];
-		int side_size = String(info.actual_size_side).to_int();
-		String icon_path = p_preset->get(info.preset_key);
-		if (icon_path.length() == 0) {
-			if ((bool)p_preset->get("icons/generate_missing")) {
-				// Resize main app icon
-				icon_path = ProjectSettings::get_singleton()->get("application/config/icon");
-				Ref<Image> img = memnew(Image);
-				Error err = ImageLoader::load_image(icon_path, img);
-				if (err != OK) {
-					ERR_PRINT("Invalid icon (" + String(info.preset_key) + "): '" + icon_path + "'.");
-					return ERR_UNCONFIGURED;
-				}
-				img->resize(side_size, side_size);
-				err = img->save_png(p_iconset_dir + info.export_name);
-				if (err) {
-					String err_str = String("Failed to export icon(" + String(info.preset_key) + "): '" + icon_path + "'.");
-					ERR_PRINT(err_str.utf8().get_data());
-					return err;
-				}
-			} else {
-				if (info.is_required) {
-					String err_str = String("Required icon (") + info.preset_key + ") is not specified in the preset.";
-					ERR_PRINT(err_str);
-					return ERR_UNCONFIGURED;
-				} else {
-					String err_str = String("Icon (") + info.preset_key + ") is not specified in the preset.";
-					WARN_PRINT(err_str);
-				}
-				continue;
-			}
-		} else {
-			// Load custom icon
-			Ref<Image> img = memnew(Image);
-			Error err = ImageLoader::load_image(icon_path, img);
-			if (err != OK) {
-				ERR_PRINT("Invalid icon (" + String(info.preset_key) + "): '" + icon_path + "'.");
-				return ERR_UNCONFIGURED;
-			}
-			if (img->get_width() != side_size || img->get_height() != side_size) {
-				ERR_PRINT("Invalid icon size (" + String(info.preset_key) + "): '" + icon_path + "'.");
-				return ERR_UNCONFIGURED;
-			}
-
-			err = da->copy(icon_path, p_iconset_dir + info.export_name);
-			if (err) {
-				memdelete(da);
-				String err_str = String("Failed to export icon(" + String(info.preset_key) + "): '" + icon_path + "'.");
-				ERR_PRINT(err_str.utf8().get_data());
-				return err;
-			}
-		}
-		sizes += String(info.actual_size_side) + "\n";
-		if (i > 0) {
-			json_description += ",";
-		}
-		json_description += String("{");
-		json_description += String("\"idiom\":") + "\"" + info.idiom + "\",";
-		json_description += String("\"size\":") + "\"" + info.unscaled_size + "\",";
-		json_description += String("\"scale\":") + "\"" + info.scale + "\",";
-		json_description += String("\"filename\":") + "\"" + info.export_name + "\"";
-		json_description += String("}");
-	}
-	json_description += "]}";
-	memdelete(da);
-
-	FileAccess *json_file = FileAccess::open(p_iconset_dir + "Contents.json", FileAccess::WRITE);
-	ERR_FAIL_COND_V(!json_file, ERR_CANT_CREATE);
-	CharString json_utf8 = json_description.utf8();
-	json_file->store_buffer((const uint8_t *)json_utf8.get_data(), json_utf8.length());
-	memdelete(json_file);
-
-	FileAccess *sizes_file = FileAccess::open(p_iconset_dir + "sizes", FileAccess::WRITE);
-	ERR_FAIL_COND_V(!sizes_file, ERR_CANT_CREATE);
-	CharString sizes_utf8 = sizes.utf8();
-	sizes_file->store_buffer((const uint8_t *)sizes_utf8.get_data(), sizes_utf8.length());
-	memdelete(sizes_file);
-
-	return OK;
-}
-
-Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir) {
-	const String custom_launch_image_2x = p_preset->get("storyboard/custom_image@2x");
-	const String custom_launch_image_3x = p_preset->get("storyboard/custom_image@3x");
-
-	if (custom_launch_image_2x.length() > 0 && custom_launch_image_3x.length() > 0) {
-		Ref<Image> image;
-		String image_path = p_dest_dir.plus_file("splash@2x.png");
-		image.instantiate();
-		Error err = image->load(custom_launch_image_2x);
-
-		if (err) {
-			image.unref();
-			return err;
-		}
-
-		if (image->save_png(image_path) != OK) {
-			return ERR_FILE_CANT_WRITE;
-		}
-
-		image.unref();
-		image_path = p_dest_dir.plus_file("splash@3x.png");
-		image.instantiate();
-		err = image->load(custom_launch_image_3x);
-
-		if (err) {
-			image.unref();
-			return err;
-		}
-
-		if (image->save_png(image_path) != OK) {
-			return ERR_FILE_CANT_WRITE;
-		}
-	} else {
-		Ref<Image> splash;
-
-		const String splash_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
-
-		if (!splash_path.is_empty()) {
-			splash.instantiate();
-			const Error err = splash->load(splash_path);
-			if (err) {
-				splash.unref();
-			}
-		}
-
-		if (splash.is_null()) {
-			splash = Ref<Image>(memnew(Image(boot_splash_png)));
-		}
-
-		// Using same image for both @2x and @3x
-		// because Godot's own boot logo uses single image for all resolutions.
-		// Also not using @1x image, because devices using this image variant
-		// are not supported by iOS 9, which is minimal target.
-		const String splash_png_path_2x = p_dest_dir.plus_file("splash@2x.png");
-		const String splash_png_path_3x = p_dest_dir.plus_file("splash@3x.png");
-
-		if (splash->save_png(splash_png_path_2x) != OK) {
-			return ERR_FILE_CANT_WRITE;
-		}
-
-		if (splash->save_png(splash_png_path_3x) != OK) {
-			return ERR_FILE_CANT_WRITE;
-		}
-	}
-
-	return OK;
-}
-
-Error EditorExportPlatformIOS::_export_loading_screen_images(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir) {
-	DirAccess *da = DirAccess::open(p_dest_dir);
-	ERR_FAIL_COND_V_MSG(!da, ERR_CANT_OPEN, "Cannot open directory '" + p_dest_dir + "'.");
-
-	for (uint64_t i = 0; i < sizeof(loading_screen_infos) / sizeof(loading_screen_infos[0]); ++i) {
-		LoadingScreenInfo info = loading_screen_infos[i];
-		String loading_screen_file = p_preset->get(info.preset_key);
-		if (loading_screen_file.size() > 0) {
-			// Load custom loading screens
-			Ref<Image> img = memnew(Image);
-			Error err = ImageLoader::load_image(loading_screen_file, img);
-			if (err != OK) {
-				ERR_PRINT("Invalid loading screen (" + String(info.preset_key) + "): '" + loading_screen_file + "'.");
-				return ERR_UNCONFIGURED;
-			}
-			if (img->get_width() != info.width || img->get_height() != info.height) {
-				ERR_PRINT("Invalid loading screen size (" + String(info.preset_key) + "): '" + loading_screen_file + "'.");
-				return ERR_UNCONFIGURED;
-			}
-			err = da->copy(loading_screen_file, p_dest_dir + info.export_name);
-			if (err) {
-				memdelete(da);
-				String err_str = String("Failed to export loading screen (") + info.preset_key + ") from path '" + loading_screen_file + "'.";
-				ERR_PRINT(err_str.utf8().get_data());
-				return err;
-			}
-		} else if ((bool)p_preset->get("launch_screens/generate_missing")) {
-			// Generate loading screen from the splash screen
-			Color boot_bg_color = ProjectSettings::get_singleton()->get("application/boot_splash/bg_color");
-			String boot_logo_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
-			bool boot_logo_scale = ProjectSettings::get_singleton()->get("application/boot_splash/fullsize");
-
-			Ref<Image> img = memnew(Image);
-			img->create(info.width, info.height, false, Image::FORMAT_RGBA8);
-			img->fill(boot_bg_color);
-
-			Ref<Image> img_bs;
-
-			if (boot_logo_path.length() > 0) {
-				img_bs = Ref<Image>(memnew(Image));
-				ImageLoader::load_image(boot_logo_path, img_bs);
-			}
-			if (!img_bs.is_valid()) {
-				img_bs = Ref<Image>(memnew(Image(boot_splash_png)));
-			}
-			if (img_bs.is_valid()) {
-				float aspect_ratio = (float)img_bs->get_width() / (float)img_bs->get_height();
-				if (info.rotate) {
-					if (boot_logo_scale) {
-						if (info.width * aspect_ratio <= info.height) {
-							img_bs->resize(info.width * aspect_ratio, info.width);
-						} else {
-							img_bs->resize(info.height, info.height / aspect_ratio);
-						}
-					}
-				} else {
-					if (boot_logo_scale) {
-						if (info.height * aspect_ratio <= info.width) {
-							img_bs->resize(info.height * aspect_ratio, info.height);
-						} else {
-							img_bs->resize(info.width, info.width / aspect_ratio);
-						}
-					}
-				}
-				_blend_and_rotate(img, img_bs, info.rotate);
-			}
-			Error err = img->save_png(p_dest_dir + info.export_name);
-			if (err) {
-				String err_str = String("Failed to export loading screen (") + info.preset_key + ") from splash screen.";
-				WARN_PRINT(err_str.utf8().get_data());
-			}
-		} else {
-			String err_str = String("No loading screen (") + info.preset_key + ") specified.";
-			WARN_PRINT(err_str.utf8().get_data());
-		}
-	}
-	memdelete(da);
-
-	return OK;
-}
-
-Error EditorExportPlatformIOS::_walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata) {
-	Vector<String> dirs;
-	String path;
-	String current_dir = p_da->get_current_dir();
-	p_da->list_dir_begin();
-	while ((path = p_da->get_next()).length() != 0) {
-		if (p_da->current_is_dir()) {
-			if (path != "." && path != "..") {
-				dirs.push_back(path);
-			}
-		} else {
-			Error err = p_handler(current_dir.plus_file(path), p_userdata);
-			if (err) {
-				p_da->list_dir_end();
-				return err;
-			}
-		}
-	}
-	p_da->list_dir_end();
-
-	for (int i = 0; i < dirs.size(); ++i) {
-		String dir = dirs[i];
-		p_da->change_dir(dir);
-		Error err = _walk_dir_recursive(p_da, p_handler, p_userdata);
-		p_da->change_dir("..");
-		if (err) {
-			return err;
-		}
-	}
-
-	return OK;
-}
-
-struct CodesignData {
-	const Ref<EditorExportPreset> &preset;
-	bool debug = false;
-
-	CodesignData(const Ref<EditorExportPreset> &p_preset, bool p_debug) :
-			preset(p_preset),
-			debug(p_debug) {
-	}
-};
-
-Error EditorExportPlatformIOS::_codesign(String p_file, void *p_userdata) {
-	if (p_file.ends_with(".dylib")) {
-		CodesignData *data = (CodesignData *)p_userdata;
-		print_line(String("Signing ") + p_file);
-		List<String> codesign_args;
-		codesign_args.push_back("-f");
-		codesign_args.push_back("-s");
-		codesign_args.push_back(data->preset->get(data->debug ? "application/code_sign_identity_debug" : "application/code_sign_identity_release"));
-		codesign_args.push_back(p_file);
-		return OS::get_singleton()->execute("codesign", codesign_args);
-	}
-	return OK;
-}
-
-struct PbxId {
-private:
-	static char _hex_char(uint8_t four_bits) {
-		if (four_bits < 10) {
-			return ('0' + four_bits);
-		}
-		return 'A' + (four_bits - 10);
-	}
-
-	static String _hex_pad(uint32_t num) {
-		Vector<char> ret;
-		ret.resize(sizeof(num) * 2);
-		for (uint64_t i = 0; i < sizeof(num) * 2; ++i) {
-			uint8_t four_bits = (num >> (sizeof(num) * 8 - (i + 1) * 4)) & 0xF;
-			ret.write[i] = _hex_char(four_bits);
-		}
-		return String::utf8(ret.ptr(), ret.size());
-	}
-
-public:
-	uint32_t high_bits;
-	uint32_t mid_bits;
-	uint32_t low_bits;
-
-	String str() const {
-		return _hex_pad(high_bits) + _hex_pad(mid_bits) + _hex_pad(low_bits);
-	}
-
-	PbxId &operator++() {
-		low_bits++;
-		if (!low_bits) {
-			mid_bits++;
-			if (!mid_bits) {
-				high_bits++;
-			}
-		}
-
-		return *this;
-	}
-};
-
-struct ExportLibsData {
-	Vector<String> lib_paths;
-	String dest_dir;
-};
-
-void EditorExportPlatformIOS::_add_assets_to_project(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_project_data, const Vector<IOSExportAsset> &p_additional_assets) {
-	// that is just a random number, we just need Godot IDs not to clash with
-	// existing IDs in the project.
-	PbxId current_id = { 0x58938401, 0, 0 };
-	String pbx_files;
-	String pbx_frameworks_build;
-	String pbx_frameworks_refs;
-	String pbx_resources_build;
-	String pbx_resources_refs;
-	String pbx_embeded_frameworks;
-
-	const String file_info_format = String("$build_id = {isa = PBXBuildFile; fileRef = $ref_id; };\n") +
-									"$ref_id = {isa = PBXFileReference; lastKnownFileType = $file_type; name = \"$name\"; path = \"$file_path\"; sourceTree = \"<group>\"; };\n";
-
-	for (int i = 0; i < p_additional_assets.size(); ++i) {
-		String additional_asset_info_format = file_info_format;
-
-		String build_id = (++current_id).str();
-		String ref_id = (++current_id).str();
-		String framework_id = "";
-
-		const IOSExportAsset &asset = p_additional_assets[i];
-
-		String type;
-		if (asset.exported_path.ends_with(".framework")) {
-			if (asset.should_embed) {
-				additional_asset_info_format += "$framework_id = {isa = PBXBuildFile; fileRef = $ref_id; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };\n";
-				framework_id = (++current_id).str();
-				pbx_embeded_frameworks += framework_id + ",\n";
-			}
-
-			type = "wrapper.framework";
-		} else if (asset.exported_path.ends_with(".xcframework")) {
-			if (asset.should_embed) {
-				additional_asset_info_format += "$framework_id = {isa = PBXBuildFile; fileRef = $ref_id; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };\n";
-				framework_id = (++current_id).str();
-				pbx_embeded_frameworks += framework_id + ",\n";
-			}
-
-			type = "wrapper.xcframework";
-		} else if (asset.exported_path.ends_with(".dylib")) {
-			type = "compiled.mach-o.dylib";
-		} else if (asset.exported_path.ends_with(".a")) {
-			type = "archive.ar";
-		} else {
-			type = "file";
-		}
-
-		String &pbx_build = asset.is_framework ? pbx_frameworks_build : pbx_resources_build;
-		String &pbx_refs = asset.is_framework ? pbx_frameworks_refs : pbx_resources_refs;
-
-		if (pbx_build.length() > 0) {
-			pbx_build += ",\n";
-			pbx_refs += ",\n";
-		}
-		pbx_build += build_id;
-		pbx_refs += ref_id;
-
-		Dictionary format_dict;
-		format_dict["build_id"] = build_id;
-		format_dict["ref_id"] = ref_id;
-		format_dict["name"] = asset.exported_path.get_file();
-		format_dict["file_path"] = asset.exported_path;
-		format_dict["file_type"] = type;
-		if (framework_id.length() > 0) {
-			format_dict["framework_id"] = framework_id;
-		}
-		pbx_files += additional_asset_info_format.format(format_dict, "$_");
-	}
-
-	// Note, frameworks like gamekit are always included in our project.pbxprof file
-	// even if turned off in capabilities.
-
-	String str = String::utf8((const char *)p_project_data.ptr(), p_project_data.size());
-	str = str.replace("$additional_pbx_files", pbx_files);
-	str = str.replace("$additional_pbx_frameworks_build", pbx_frameworks_build);
-	str = str.replace("$additional_pbx_frameworks_refs", pbx_frameworks_refs);
-	str = str.replace("$additional_pbx_resources_build", pbx_resources_build);
-	str = str.replace("$additional_pbx_resources_refs", pbx_resources_refs);
-	str = str.replace("$pbx_embeded_frameworks", pbx_embeded_frameworks);
-
-	CharString cs = str.utf8();
-	p_project_data.resize(cs.size() - 1);
-	for (int i = 0; i < cs.size() - 1; i++) {
-		p_project_data.write[i] = cs[i];
-	}
-}
-
-Error EditorExportPlatformIOS::_copy_asset(const String &p_out_dir, const String &p_asset, const String *p_custom_file_name, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets) {
-	DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	ERR_FAIL_COND_V_MSG(!filesystem_da, ERR_CANT_CREATE, "Cannot create DirAccess for path '" + p_out_dir + "'.");
-
-	String binary_name = p_out_dir.get_file().get_basename();
-
-	DirAccess *da = DirAccess::create_for_path(p_asset);
-	if (!da) {
-		memdelete(filesystem_da);
-		ERR_FAIL_V_MSG(ERR_CANT_CREATE, "Can't create directory: " + p_asset + ".");
-	}
-	bool file_exists = da->file_exists(p_asset);
-	bool dir_exists = da->dir_exists(p_asset);
-	if (!file_exists && !dir_exists) {
-		memdelete(da);
-		memdelete(filesystem_da);
-		return ERR_FILE_NOT_FOUND;
-	}
-
-	String base_dir = p_asset.get_base_dir().replace("res://", "");
-	String destination_dir;
-	String destination;
-	String asset_path;
-
-	bool create_framework = false;
-
-	if (p_is_framework && p_asset.ends_with(".dylib")) {
-		// For iOS we need to turn .dylib into .framework
-		// to be able to send application to AppStore
-		asset_path = String("dylibs").plus_file(base_dir);
-
-		String file_name;
-
-		if (!p_custom_file_name) {
-			file_name = p_asset.get_basename().get_file();
-		} else {
-			file_name = *p_custom_file_name;
-		}
-
-		String framework_name = file_name + ".framework";
-
-		asset_path = asset_path.plus_file(framework_name);
-		destination_dir = p_out_dir.plus_file(asset_path);
-		destination = destination_dir.plus_file(file_name);
-		create_framework = true;
-	} else if (p_is_framework && (p_asset.ends_with(".framework") || p_asset.ends_with(".xcframework"))) {
-		asset_path = String("dylibs").plus_file(base_dir);
-
-		String file_name;
-
-		if (!p_custom_file_name) {
-			file_name = p_asset.get_file();
-		} else {
-			file_name = *p_custom_file_name;
-		}
-
-		asset_path = asset_path.plus_file(file_name);
-		destination_dir = p_out_dir.plus_file(asset_path);
-		destination = destination_dir;
-	} else {
-		asset_path = base_dir;
-
-		String file_name;
-
-		if (!p_custom_file_name) {
-			file_name = p_asset.get_file();
-		} else {
-			file_name = *p_custom_file_name;
-		}
-
-		destination_dir = p_out_dir.plus_file(asset_path);
-		asset_path = asset_path.plus_file(file_name);
-		destination = p_out_dir.plus_file(asset_path);
-	}
-
-	if (!filesystem_da->dir_exists(destination_dir)) {
-		Error make_dir_err = filesystem_da->make_dir_recursive(destination_dir);
-		if (make_dir_err) {
-			memdelete(da);
-			memdelete(filesystem_da);
-			return make_dir_err;
-		}
-	}
-
-	Error err = dir_exists ? da->copy_dir(p_asset, destination) : da->copy(p_asset, destination);
-	memdelete(da);
-	if (err) {
-		memdelete(filesystem_da);
-		return err;
-	}
-	IOSExportAsset exported_asset = { binary_name.plus_file(asset_path), p_is_framework, p_should_embed };
-	r_exported_assets.push_back(exported_asset);
-
-	if (create_framework) {
-		String file_name;
-
-		if (!p_custom_file_name) {
-			file_name = p_asset.get_basename().get_file();
-		} else {
-			file_name = *p_custom_file_name;
-		}
-
-		String framework_name = file_name + ".framework";
-
-		// Performing `install_name_tool -id @rpath/{name}.framework/{name} ./{name}` on dylib
-		{
-			List<String> install_name_args;
-			install_name_args.push_back("-id");
-			install_name_args.push_back(String("@rpath").plus_file(framework_name).plus_file(file_name));
-			install_name_args.push_back(destination);
-
-			OS::get_singleton()->execute("install_name_tool", install_name_args);
-		}
-
-		// Creating Info.plist
-		{
-			String info_plist_format = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-									   "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-									   "<plist version=\"1.0\">\n"
-									   "<dict>\n"
-									   "<key>CFBundleShortVersionString</key>\n"
-									   "<string>1.0</string>\n"
-									   "<key>CFBundleIdentifier</key>\n"
-									   "<string>com.gdnative.framework.$name</string>\n"
-									   "<key>CFBundleName</key>\n"
-									   "<string>$name</string>\n"
-									   "<key>CFBundleExecutable</key>\n"
-									   "<string>$name</string>\n"
-									   "<key>DTPlatformName</key>\n"
-									   "<string>iphoneos</string>\n"
-									   "<key>CFBundleInfoDictionaryVersion</key>\n"
-									   "<string>6.0</string>\n"
-									   "<key>CFBundleVersion</key>\n"
-									   "<string>1</string>\n"
-									   "<key>CFBundlePackageType</key>\n"
-									   "<string>FMWK</string>\n"
-									   "<key>MinimumOSVersion</key>\n"
-									   "<string>10.0</string>\n"
-									   "</dict>\n"
-									   "</plist>";
-
-			String info_plist = info_plist_format.replace("$name", file_name);
-
-			FileAccess *f = FileAccess::open(destination_dir.plus_file("Info.plist"), FileAccess::WRITE);
-			if (f) {
-				f->store_string(info_plist);
-				f->close();
-				memdelete(f);
-			}
-		}
-	}
-
-	memdelete(filesystem_da);
-
-	return OK;
-}
-
-Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets) {
-	for (int f_idx = 0; f_idx < p_assets.size(); ++f_idx) {
-		String asset = p_assets[f_idx];
-		if (!asset.begins_with("res://")) {
-			// either SDK-builtin or already a part of the export template
-			IOSExportAsset exported_asset = { asset, p_is_framework, p_should_embed };
-			r_exported_assets.push_back(exported_asset);
-		} else {
-			Error err = _copy_asset(p_out_dir, asset, nullptr, p_is_framework, p_should_embed, r_exported_assets);
-			ERR_FAIL_COND_V(err, err);
-		}
-	}
-
-	return OK;
-}
-
-Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<IOSExportAsset> &r_exported_assets) {
-	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
-	for (int i = 0; i < export_plugins.size(); i++) {
-		Vector<String> linked_frameworks = export_plugins[i]->get_ios_frameworks();
-		Error err = _export_additional_assets(p_out_dir, linked_frameworks, true, false, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-
-		Vector<String> embedded_frameworks = export_plugins[i]->get_ios_embedded_frameworks();
-		err = _export_additional_assets(p_out_dir, embedded_frameworks, true, true, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-
-		Vector<String> project_static_libs = export_plugins[i]->get_ios_project_static_libs();
-		for (int j = 0; j < project_static_libs.size(); j++) {
-			project_static_libs.write[j] = project_static_libs[j].get_file(); // Only the file name as it's copied to the project
-		}
-		err = _export_additional_assets(p_out_dir, project_static_libs, true, true, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-
-		Vector<String> ios_bundle_files = export_plugins[i]->get_ios_bundle_files();
-		err = _export_additional_assets(p_out_dir, ios_bundle_files, false, false, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-	}
-
-	Vector<String> library_paths;
-	for (int i = 0; i < p_libraries.size(); ++i) {
-		library_paths.push_back(p_libraries[i].path);
-	}
-	Error err = _export_additional_assets(p_out_dir, library_paths, true, true, r_exported_assets);
-	ERR_FAIL_COND_V(err, err);
-
-	return OK;
-}
-
-Vector<String> EditorExportPlatformIOS::_get_preset_architectures(const Ref<EditorExportPreset> &p_preset) {
-	Vector<ExportArchitecture> all_archs = _get_supported_architectures();
-	Vector<String> enabled_archs;
-	for (int i = 0; i < all_archs.size(); ++i) {
-		bool is_enabled = p_preset->get("architectures/" + all_archs[i].name);
-		if (is_enabled) {
-			enabled_archs.push_back(all_archs[i].name);
-		}
-	}
-	return enabled_archs;
-}
-
-Error EditorExportPlatformIOS::_export_ios_plugins(const Ref<EditorExportPreset> &p_preset, IOSConfigData &p_config_data, const String &dest_dir, Vector<IOSExportAsset> &r_exported_assets, bool p_debug) {
-	String plugin_definition_cpp_code;
-	String plugin_initialization_cpp_code;
-	String plugin_deinitialization_cpp_code;
-
-	Vector<String> plugin_linked_dependencies;
-	Vector<String> plugin_embedded_dependencies;
-	Vector<String> plugin_files;
-
-	Vector<PluginConfigIOS> enabled_plugins = get_enabled_plugins(p_preset);
-
-	Vector<String> added_linked_dependenciy_names;
-	Vector<String> added_embedded_dependenciy_names;
-	HashMap<String, String> plist_values;
-
-	Set<String> plugin_linker_flags;
-
-	Error err;
-
-	for (int i = 0; i < enabled_plugins.size(); i++) {
-		PluginConfigIOS plugin = enabled_plugins[i];
-
-		// Export plugin binary.
-		String plugin_main_binary = get_plugin_main_binary(plugin, p_debug);
-		String plugin_binary_result_file = plugin.binary.get_file();
-		// We shouldn't embed .xcframework that contains static libraries.
-		// Static libraries are not embedded anyway.
-		err = _copy_asset(dest_dir, plugin_main_binary, &plugin_binary_result_file, true, false, r_exported_assets);
-
-		ERR_FAIL_COND_V(err, err);
-
-		// Adding dependencies.
-		// Use separate container for names to check for duplicates.
-		for (int j = 0; j < plugin.linked_dependencies.size(); j++) {
-			String dependency = plugin.linked_dependencies[j];
-			String name = dependency.get_file();
-
-			if (added_linked_dependenciy_names.has(name)) {
-				continue;
-			}
-
-			added_linked_dependenciy_names.push_back(name);
-			plugin_linked_dependencies.push_back(dependency);
-		}
-
-		for (int j = 0; j < plugin.system_dependencies.size(); j++) {
-			String dependency = plugin.system_dependencies[j];
-			String name = dependency.get_file();
-
-			if (added_linked_dependenciy_names.has(name)) {
-				continue;
-			}
-
-			added_linked_dependenciy_names.push_back(name);
-			plugin_linked_dependencies.push_back(dependency);
-		}
-
-		for (int j = 0; j < plugin.embedded_dependencies.size(); j++) {
-			String dependency = plugin.embedded_dependencies[j];
-			String name = dependency.get_file();
-
-			if (added_embedded_dependenciy_names.has(name)) {
-				continue;
-			}
-
-			added_embedded_dependenciy_names.push_back(name);
-			plugin_embedded_dependencies.push_back(dependency);
-		}
-
-		plugin_files.append_array(plugin.files_to_copy);
-
-		// Capabilities
-		// Also checking for duplicates.
-		for (int j = 0; j < plugin.capabilities.size(); j++) {
-			String capability = plugin.capabilities[j];
-
-			if (p_config_data.capabilities.has(capability)) {
-				continue;
-			}
-
-			p_config_data.capabilities.push_back(capability);
-		}
-
-		// Linker flags
-		// Checking duplicates
-		for (int j = 0; j < plugin.linker_flags.size(); j++) {
-			String linker_flag = plugin.linker_flags[j];
-			plugin_linker_flags.insert(linker_flag);
-		}
-
-		// Plist
-		// Using hash map container to remove duplicates
-		const String *K = nullptr;
-
-		while ((K = plugin.plist.next(K))) {
-			String key = *K;
-			PluginConfigIOS::PlistItem item = plugin.plist[key];
-
-			String value;
-
-			switch (item.type) {
-				case PluginConfigIOS::PlistItemType::STRING_INPUT: {
-					String preset_name = "plugins_plist/" + key;
-					String input_value = p_preset->get(preset_name);
-					value = "<string>" + input_value + "</string>";
-				} break;
-				default:
-					value = item.value;
-					break;
-			}
-
-			if (key.is_empty() || value.is_empty()) {
-				continue;
-			}
-
-			String plist_key = "<key>" + key + "</key>";
-
-			plist_values[plist_key] = value;
-		}
-
-		// CPP Code
-		String definition_comment = "// Plugin: " + plugin.name + "\n";
-		String initialization_method = plugin.initialization_method + "();\n";
-		String deinitialization_method = plugin.deinitialization_method + "();\n";
-
-		plugin_definition_cpp_code += definition_comment +
-									  "extern void " + initialization_method +
-									  "extern void " + deinitialization_method + "\n";
-
-		plugin_initialization_cpp_code += "\t" + initialization_method;
-		plugin_deinitialization_cpp_code += "\t" + deinitialization_method;
-	}
-
-	// Updating `Info.plist`
-	{
-		const String *K = nullptr;
-		while ((K = plist_values.next(K))) {
-			String key = *K;
-			String value = plist_values[key];
-
-			if (key.is_empty() || value.is_empty()) {
-				continue;
-			}
-
-			p_config_data.plist_content += key + value + "\n";
-		}
-	}
-
-	// Export files
-	{
-		// Export linked plugin dependency
-		err = _export_additional_assets(dest_dir, plugin_linked_dependencies, true, false, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-
-		// Export embedded plugin dependency
-		err = _export_additional_assets(dest_dir, plugin_embedded_dependencies, true, true, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-
-		// Export plugin files
-		err = _export_additional_assets(dest_dir, plugin_files, false, false, r_exported_assets);
-		ERR_FAIL_COND_V(err, err);
-	}
-
-	// Update CPP
-	{
-		Dictionary plugin_format;
-		plugin_format["definition"] = plugin_definition_cpp_code;
-		plugin_format["initialization"] = plugin_initialization_cpp_code;
-		plugin_format["deinitialization"] = plugin_deinitialization_cpp_code;
-
-		String plugin_cpp_code = "\n// Godot Plugins\n"
-								 "void godot_ios_plugins_initialize();\n"
-								 "void godot_ios_plugins_deinitialize();\n"
-								 "// Exported Plugins\n\n"
-								 "$definition"
-								 "// Use Plugins\n"
-								 "void godot_ios_plugins_initialize() {\n"
-								 "$initialization"
-								 "}\n\n"
-								 "void godot_ios_plugins_deinitialize() {\n"
-								 "$deinitialization"
-								 "}\n";
-
-		p_config_data.cpp_code += plugin_cpp_code.format(plugin_format, "$_");
-	}
-
-	// Update Linker Flag Values
-	{
-		String result_linker_flags = " ";
-		for (Set<String>::Element *E = plugin_linker_flags.front(); E; E = E->next()) {
-			const String &flag = E->get();
-
-			if (flag.length() == 0) {
-				continue;
-			}
-
-			if (result_linker_flags.length() > 0) {
-				result_linker_flags += ' ';
-			}
-
-			result_linker_flags += flag;
-		}
-		result_linker_flags = result_linker_flags.replace("\"", "\\\"");
-		p_config_data.linker_flags += result_linker_flags;
-	}
-
-	return OK;
-}
-
-Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
-	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-
-	String src_pkg_name;
-	String dest_dir = p_path.get_base_dir() + "/";
-	String binary_name = p_path.get_file().get_basename();
-
-	EditorProgress ep("export", "Exporting for iOS", 5, true);
-
-	String team_id = p_preset->get("application/app_store_team_id");
-	ERR_FAIL_COND_V_MSG(team_id.length() == 0, ERR_CANT_OPEN, "App Store Team ID not specified - cannot configure the project.");
-
-	if (p_debug) {
-		src_pkg_name = p_preset->get("custom_template/debug");
-	} else {
-		src_pkg_name = p_preset->get("custom_template/release");
-	}
-
-	if (src_pkg_name == "") {
-		String err;
-		src_pkg_name = find_export_template("iphone.zip", &err);
-		if (src_pkg_name == "") {
-			EditorNode::add_io_error(err);
-			return ERR_FILE_NOT_FOUND;
-		}
-	}
-
-	if (!DirAccess::exists(dest_dir)) {
-		return ERR_FILE_BAD_PATH;
-	}
-
-	DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	if (da) {
-		String current_dir = da->get_current_dir();
-
-		// remove leftovers from last export so they don't interfere
-		// in case some files are no longer needed
-		if (da->change_dir(dest_dir + binary_name + ".xcodeproj") == OK) {
-			da->erase_contents_recursive();
-		}
-		if (da->change_dir(dest_dir + binary_name) == OK) {
-			da->erase_contents_recursive();
-		}
-
-		da->change_dir(current_dir);
-
-		if (!da->dir_exists(dest_dir + binary_name)) {
-			Error err = da->make_dir(dest_dir + binary_name);
-			if (err) {
-				memdelete(da);
-				return err;
-			}
-		}
-		memdelete(da);
-	}
-
-	if (ep.step("Making .pck", 0)) {
-		return ERR_SKIP;
-	}
-	String pack_path = dest_dir + binary_name + ".pck";
-	Vector<SharedObject> libraries;
-	Error err = save_pack(p_preset, pack_path, &libraries);
-	if (err) {
-		return err;
-	}
-
-	if (ep.step("Extracting and configuring Xcode project", 1)) {
-		return ERR_SKIP;
-	}
-
-	String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".xcframework";
-
-	print_line("Static framework: " + library_to_use);
-	String pkg_name;
-	if (p_preset->get("application/name") != "") {
-		pkg_name = p_preset->get("application/name"); // app_name
-	} else if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
-		pkg_name = String(ProjectSettings::get_singleton()->get("application/config/name"));
-	} else {
-		pkg_name = "Unnamed";
-	}
-
-	bool found_library = false;
-	int total_size = 0;
-
-	const String project_file = "godot_ios.xcodeproj/project.pbxproj";
-	Set<String> files_to_parse;
-	files_to_parse.insert("godot_ios/godot_ios-Info.plist");
-	files_to_parse.insert(project_file);
-	files_to_parse.insert("godot_ios/export_options.plist");
-	files_to_parse.insert("godot_ios/dummy.cpp");
-	files_to_parse.insert("godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata");
-	files_to_parse.insert("godot_ios.xcodeproj/xcshareddata/xcschemes/godot_ios.xcscheme");
-	files_to_parse.insert("godot_ios/godot_ios.entitlements");
-	files_to_parse.insert("godot_ios/Launch Screen.storyboard");
-
-	IOSConfigData config_data = {
-		pkg_name,
-		binary_name,
-		_get_additional_plist_content(),
-		String(" ").join(_get_preset_architectures(p_preset)),
-		_get_linker_flags(),
-		_get_cpp_code(),
-		"",
-		"",
-		"",
-		"",
-		Vector<String>()
-	};
-
-	Vector<IOSExportAsset> assets;
-
-	DirAccess *tmp_app_path = DirAccess::create_for_path(dest_dir);
-	ERR_FAIL_COND_V(!tmp_app_path, ERR_CANT_CREATE);
-
-	print_line("Unzipping...");
-	FileAccess *src_f = nullptr;
-	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
-	unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io);
-	if (!src_pkg_zip) {
-		EditorNode::add_io_error("Could not open export template (not a zip file?):\n" + src_pkg_name);
-		return ERR_CANT_OPEN;
-	}
-
-	err = _export_ios_plugins(p_preset, config_data, dest_dir + binary_name, assets, p_debug);
-	ERR_FAIL_COND_V(err, err);
-
-	//export rest of the files
-	int ret = unzGoToFirstFile(src_pkg_zip);
-	Vector<uint8_t> project_file_data;
-	while (ret == UNZ_OK) {
-#if defined(OSX_ENABLED) || defined(X11_ENABLED)
-		bool is_execute = false;
-#endif
-
-		//get filename
-		unz_file_info info;
-		char fname[16384];
-		ret = unzGetCurrentFileInfo(src_pkg_zip, &info, fname, 16384, nullptr, 0, nullptr, 0);
-
-		String file = fname;
-
-		print_line("READ: " + file);
-		Vector<uint8_t> data;
-		data.resize(info.uncompressed_size);
-
-		//read
-		unzOpenCurrentFile(src_pkg_zip);
-		unzReadCurrentFile(src_pkg_zip, data.ptrw(), data.size());
-		unzCloseCurrentFile(src_pkg_zip);
-
-		//write
-
-		file = file.replace_first("iphone/", "");
-
-		if (files_to_parse.has(file)) {
-			_fix_config_file(p_preset, data, config_data, p_debug);
-		} else if (file.begins_with("libgodot.iphone")) {
-			if (!file.begins_with(library_to_use) || file.ends_with(String("/empty"))) {
-				ret = unzGoToNextFile(src_pkg_zip);
-				continue; //ignore!
-			}
-			found_library = true;
-#if defined(OSX_ENABLED) || defined(X11_ENABLED)
-			is_execute = true;
-#endif
-			file = file.replace(library_to_use, binary_name + ".xcframework");
-		}
-
-		if (file == project_file) {
-			project_file_data = data;
-		}
-
-		///@TODO need to parse logo files
-
-		if (data.size() > 0) {
-			file = file.replace("godot_ios", binary_name);
-
-			print_line("ADDING: " + file + " size: " + itos(data.size()));
-			total_size += data.size();
-
-			/* write it into our folder structure */
-			file = dest_dir + file;
-
-			/* make sure this folder exists */
-			String dir_name = file.get_base_dir();
-			if (!tmp_app_path->dir_exists(dir_name)) {
-				print_line("Creating " + dir_name);
-				Error dir_err = tmp_app_path->make_dir_recursive(dir_name);
-				if (dir_err) {
-					ERR_PRINT("Can't create '" + dir_name + "'.");
-					unzClose(src_pkg_zip);
-					memdelete(tmp_app_path);
-					return ERR_CANT_CREATE;
-				}
-			}
-
-			/* write the file */
-			FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
-			if (!f) {
-				ERR_PRINT("Can't write '" + file + "'.");
-				unzClose(src_pkg_zip);
-				memdelete(tmp_app_path);
-				return ERR_CANT_CREATE;
-			};
-			f->store_buffer(data.ptr(), data.size());
-			f->close();
-			memdelete(f);
-
-#if defined(OSX_ENABLED) || defined(X11_ENABLED)
-			if (is_execute) {
-				// we need execute rights on this file
-				chmod(file.utf8().get_data(), 0755);
-			}
-#endif
-		}
-
-		ret = unzGoToNextFile(src_pkg_zip);
-	}
-
-	/* we're done with our source zip */
-	unzClose(src_pkg_zip);
-
-	if (!found_library) {
-		ERR_PRINT("Requested template library '" + library_to_use + "' not found. It might be missing from your template archive.");
-		memdelete(tmp_app_path);
-		return ERR_FILE_NOT_FOUND;
-	}
-
-	// Copy project static libs to the project
-	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
-	for (int i = 0; i < export_plugins.size(); i++) {
-		Vector<String> project_static_libs = export_plugins[i]->get_ios_project_static_libs();
-		for (int j = 0; j < project_static_libs.size(); j++) {
-			const String &static_lib_path = project_static_libs[j];
-			String dest_lib_file_path = dest_dir + static_lib_path.get_file();
-			Error lib_copy_err = tmp_app_path->copy(static_lib_path, dest_lib_file_path);
-			if (lib_copy_err != OK) {
-				ERR_PRINT("Can't copy '" + static_lib_path + "'.");
-				memdelete(tmp_app_path);
-				return lib_copy_err;
-			}
-		}
-	}
-
-	String iconset_dir = dest_dir + binary_name + "/Images.xcassets/AppIcon.appiconset/";
-	err = OK;
-	if (!tmp_app_path->dir_exists(iconset_dir)) {
-		err = tmp_app_path->make_dir_recursive(iconset_dir);
-	}
-	memdelete(tmp_app_path);
-	if (err) {
-		return err;
-	}
-
-	err = _export_icons(p_preset, iconset_dir);
-	if (err) {
-		return err;
-	}
-
-	bool use_storyboard = p_preset->get("storyboard/use_launch_screen_storyboard");
-
-	String launch_image_path = dest_dir + binary_name + "/Images.xcassets/LaunchImage.launchimage/";
-	String splash_image_path = dest_dir + binary_name + "/Images.xcassets/SplashImage.imageset/";
-
-	DirAccess *launch_screen_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-
-	if (!launch_screen_da) {
-		return ERR_CANT_CREATE;
-	}
-
-	if (use_storyboard) {
-		print_line("Using Launch Storyboard");
-
-		if (launch_screen_da->change_dir(launch_image_path) == OK) {
-			launch_screen_da->erase_contents_recursive();
-			launch_screen_da->remove(launch_image_path);
-		}
-
-		err = _export_loading_screen_file(p_preset, splash_image_path);
-	} else {
-		print_line("Using Launch Images");
-
-		const String launch_screen_path = dest_dir + binary_name + "/Launch Screen.storyboard";
-
-		launch_screen_da->remove(launch_screen_path);
-
-		if (launch_screen_da->change_dir(splash_image_path) == OK) {
-			launch_screen_da->erase_contents_recursive();
-			launch_screen_da->remove(splash_image_path);
-		}
-
-		err = _export_loading_screen_images(p_preset, launch_image_path);
-	}
-
-	memdelete(launch_screen_da);
-
-	if (err) {
-		return err;
-	}
-
-	print_line("Exporting additional assets");
-	_export_additional_assets(dest_dir + binary_name, libraries, assets);
-	_add_assets_to_project(p_preset, project_file_data, assets);
-	String project_file_name = dest_dir + binary_name + ".xcodeproj/project.pbxproj";
-	FileAccess *f = FileAccess::open(project_file_name, FileAccess::WRITE);
-	if (!f) {
-		ERR_PRINT("Can't write '" + project_file_name + "'.");
-		return ERR_CANT_CREATE;
-	};
-	f->store_buffer(project_file_data.ptr(), project_file_data.size());
-	f->close();
-	memdelete(f);
-
-#ifdef OSX_ENABLED
-	if (ep.step("Code-signing dylibs", 2)) {
-		return ERR_SKIP;
-	}
-	DirAccess *dylibs_dir = DirAccess::open(dest_dir + binary_name + "/dylibs");
-	ERR_FAIL_COND_V(!dylibs_dir, ERR_CANT_OPEN);
-	CodesignData codesign_data(p_preset, p_debug);
-	err = _walk_dir_recursive(dylibs_dir, _codesign, &codesign_data);
-	memdelete(dylibs_dir);
-	ERR_FAIL_COND_V(err, err);
-
-	if (ep.step("Making .xcarchive", 3)) {
-		return ERR_SKIP;
-	}
-	String archive_path = p_path.get_basename() + ".xcarchive";
-	List<String> archive_args;
-	archive_args.push_back("-project");
-	archive_args.push_back(dest_dir + binary_name + ".xcodeproj");
-	archive_args.push_back("-scheme");
-	archive_args.push_back(binary_name);
-	archive_args.push_back("-sdk");
-	archive_args.push_back("iphoneos");
-	archive_args.push_back("-configuration");
-	archive_args.push_back(p_debug ? "Debug" : "Release");
-	archive_args.push_back("-destination");
-	archive_args.push_back("generic/platform=iOS");
-	archive_args.push_back("archive");
-	archive_args.push_back("-archivePath");
-	archive_args.push_back(archive_path);
-	err = OS::get_singleton()->execute("xcodebuild", archive_args);
-	ERR_FAIL_COND_V(err, err);
-
-	if (ep.step("Making .ipa", 4)) {
-		return ERR_SKIP;
-	}
-	List<String> export_args;
-	export_args.push_back("-exportArchive");
-	export_args.push_back("-archivePath");
-	export_args.push_back(archive_path);
-	export_args.push_back("-exportOptionsPlist");
-	export_args.push_back(dest_dir + binary_name + "/export_options.plist");
-	export_args.push_back("-allowProvisioningUpdates");
-	export_args.push_back("-exportPath");
-	export_args.push_back(dest_dir);
-	err = OS::get_singleton()->execute("xcodebuild", export_args);
-	ERR_FAIL_COND_V(err, err);
-#else
-	print_line(".ipa can only be built on macOS. Leaving Xcode project without building the package.");
-#endif
-
-	return OK;
-}
-
-bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
-	String err;
-	bool valid = false;
-
-	// Look for export templates (first official, and if defined custom templates).
-
-	bool dvalid = exists_export_template("iphone.zip", &err);
-	bool rvalid = dvalid; // Both in the same ZIP.
-
-	if (p_preset->get("custom_template/debug") != "") {
-		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
-		if (!dvalid) {
-			err += TTR("Custom debug template not found.") + "\n";
-		}
-	}
-	if (p_preset->get("custom_template/release") != "") {
-		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
-		if (!rvalid) {
-			err += TTR("Custom release template not found.") + "\n";
-		}
-	}
-
-	valid = dvalid || rvalid;
-	r_missing_templates = !valid;
-
-	// Validate the rest of the configuration.
-
-	String team_id = p_preset->get("application/app_store_team_id");
-	if (team_id.length() == 0) {
-		err += TTR("App Store Team ID not specified - cannot configure the project.") + "\n";
-		valid = false;
-	}
-
-	String identifier = p_preset->get("application/bundle_identifier");
-	String pn_err;
-	if (!is_package_name_valid(identifier, &pn_err)) {
-		err += TTR("Invalid Identifier:") + " " + pn_err + "\n";
-		valid = false;
-	}
-
-	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
-		IconInfo info = icon_infos[i];
-		String icon_path = p_preset->get(info.preset_key);
-		if (icon_path.length() == 0) {
-			if (info.is_required) {
-				err += TTR("Required icon is not specified in the preset.") + "\n";
-				valid = false;
-			}
-			break;
-		}
-	}
-
-	String etc_error = test_etc2_or_pvrtc();
-	if (etc_error != String()) {
-		valid = false;
-		err += etc_error;
-	}
-
-	if (!err.is_empty()) {
-		r_error = err;
-	}
-
-	return valid;
-}
-
-EditorExportPlatformIOS::EditorExportPlatformIOS() {
-	Ref<Image> img = memnew(Image(_iphone_logo));
-	logo.instantiate();
-	logo->create_from_image(img);
-
-	plugins_changed.set();
-
-	check_for_changes_thread.start(_check_for_changes_poll_thread, this);
-}
-
-EditorExportPlatformIOS::~EditorExportPlatformIOS() {
-	quit_request.set();
-	check_for_changes_thread.wait_to_finish();
-}
+#include "export_plugin.h"
 
 void register_iphone_exporter() {
 	Ref<EditorExportPlatformIOS> platform;
diff --git a/platform/iphone/export/export_plugin.cpp b/platform/iphone/export/export_plugin.cpp
new file mode 100644
index 0000000000..69a8203e9f
--- /dev/null
+++ b/platform/iphone/export/export_plugin.cpp
@@ -0,0 +1,1792 @@
+/*************************************************************************/
+/*  export_plugin.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "export_plugin.h"
+
+void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
+	String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
+	r_features->push_back("pvrtc");
+	if (driver == "Vulkan") {
+		// FIXME: Review if this is correct.
+		r_features->push_back("etc2");
+	}
+
+	Vector<String> architectures = _get_preset_architectures(p_preset);
+	for (int i = 0; i < architectures.size(); ++i) {
+		r_features->push_back(architectures[i]);
+	}
+}
+
+Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() {
+	Vector<ExportArchitecture> archs;
+	archs.push_back(ExportArchitecture("armv7", false)); // Disabled by default, not included in official templates.
+	archs.push_back(ExportArchitecture("arm64", true));
+	return archs;
+}
+
+struct LoadingScreenInfo {
+	const char *preset_key;
+	const char *export_name;
+	int width = 0;
+	int height = 0;
+	bool rotate = false;
+};
+
+static const LoadingScreenInfo loading_screen_infos[] = {
+	{ "landscape_launch_screens/iphone_2436x1125", "Default-Landscape-X.png", 2436, 1125, false },
+	{ "landscape_launch_screens/iphone_2208x1242", "Default-Landscape-736h@3x.png", 2208, 1242, false },
+	{ "landscape_launch_screens/ipad_1024x768", "Default-Landscape.png", 1024, 768, false },
+	{ "landscape_launch_screens/ipad_2048x1536", "Default-Landscape@2x.png", 2048, 1536, false },
+
+	{ "portrait_launch_screens/iphone_640x960", "Default-480h@2x.png", 640, 960, true },
+	{ "portrait_launch_screens/iphone_640x1136", "Default-568h@2x.png", 640, 1136, true },
+	{ "portrait_launch_screens/iphone_750x1334", "Default-667h@2x.png", 750, 1334, true },
+	{ "portrait_launch_screens/iphone_1125x2436", "Default-Portrait-X.png", 1125, 2436, true },
+	{ "portrait_launch_screens/ipad_768x1024", "Default-Portrait.png", 768, 1024, true },
+	{ "portrait_launch_screens/ipad_1536x2048", "Default-Portrait@2x.png", 1536, 2048, true },
+	{ "portrait_launch_screens/iphone_1242x2208", "Default-Portrait-736h@3x.png", 1242, 2208, true }
+};
+
+void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) {
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+
+	Vector<ExportArchitecture> architectures = _get_supported_architectures();
+	for (int i = 0; i < architectures.size(); ++i) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + architectures[i].name), architectures[i].is_default));
+	}
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/app_store_team_id"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/provisioning_profile_uuid_debug"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_debug", PROPERTY_HINT_PLACEHOLDER_TEXT, "iPhone Developer"), "iPhone Developer"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_debug", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 1));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/provisioning_profile_uuid_release"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_release", PROPERTY_HINT_PLACEHOLDER_TEXT, "iPhone Distribution"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_release", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 0));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/targeted_device_family", PROPERTY_HINT_ENUM, "iPhone,iPad,iPhone & iPad"), 2));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/bundle_identifier", PROPERTY_HINT_PLACEHOLDER_TEXT, "com.example.game"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/signature"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version"), "1.0"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version"), "1.0"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
+
+	Vector<PluginConfigIOS> found_plugins = get_plugins();
+	for (int i = 0; i < found_plugins.size(); i++) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "plugins/" + found_plugins[i].name), false));
+	}
+
+	Set<String> plist_keys;
+
+	for (int i = 0; i < found_plugins.size(); i++) {
+		// Editable plugin plist values
+		PluginConfigIOS plugin = found_plugins[i];
+		const String *K = nullptr;
+
+		while ((K = plugin.plist.next(K))) {
+			String key = *K;
+			PluginConfigIOS::PlistItem item = plugin.plist[key];
+			switch (item.type) {
+				case PluginConfigIOS::PlistItemType::STRING_INPUT: {
+					String preset_name = "plugins_plist/" + key;
+					if (!plist_keys.has(preset_name)) {
+						r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, preset_name), item.value));
+						plist_keys.insert(preset_name);
+					}
+				} break;
+				default:
+					continue;
+			}
+		}
+	}
+
+	plugins_changed.clear();
+	plugins = found_plugins;
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/access_wifi"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/push_notifications"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data/accessible_from_files_app"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data/accessible_from_itunes_sharing"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/camera_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the camera"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/microphone_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the microphone"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/photolibrary_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need access to the photo library"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "icons/generate_missing"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/iphone_120x120", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPhone/iPod Touch with retina display
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/ipad_76x76", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPad
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/app_store_1024x1024", PROPERTY_HINT_FILE, "*.png"), "")); // App Store
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/iphone_180x180", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPhone with retina HD display
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/ipad_152x152", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPad with retina display
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/ipad_167x167", PROPERTY_HINT_FILE, "*.png"), "")); // Home screen on iPad Pro
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/spotlight_40x40", PROPERTY_HINT_FILE, "*.png"), "")); // Spotlight
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/spotlight_80x80", PROPERTY_HINT_FILE, "*.png"), "")); // Spotlight on devices with retina display
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "storyboard/use_launch_screen_storyboard"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "storyboard/image_scale_mode", PROPERTY_HINT_ENUM, "Same as Logo,Center,Scale to Fit,Scale to Fill,Scale"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@2x", PROPERTY_HINT_FILE, "*.png"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@3x", PROPERTY_HINT_FILE, "*.png"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "storyboard/use_custom_bg_color"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::COLOR, "storyboard/custom_bg_color"), Color()));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "launch_screens/generate_missing"), false));
+
+	for (uint64_t i = 0; i < sizeof(loading_screen_infos) / sizeof(loading_screen_infos[0]); ++i) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, loading_screen_infos[i].preset_key, PROPERTY_HINT_FILE, "*.png"), ""));
+	}
+}
+
+void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const IOSConfigData &p_config, bool p_debug) {
+	static const String export_method_string[] = {
+		"app-store",
+		"development",
+		"ad-hoc",
+		"enterprise"
+	};
+	static const String storyboard_image_scale_mode[] = {
+		"center",
+		"scaleAspectFit",
+		"scaleAspectFill",
+		"scaleToFill"
+	};
+	String str;
+	String strnew;
+	str.parse_utf8((const char *)pfile.ptr(), pfile.size());
+	Vector<String> lines = str.split("\n");
+	for (int i = 0; i < lines.size(); i++) {
+		if (lines[i].find("$binary") != -1) {
+			strnew += lines[i].replace("$binary", p_config.binary_name) + "\n";
+		} else if (lines[i].find("$modules_buildfile") != -1) {
+			strnew += lines[i].replace("$modules_buildfile", p_config.modules_buildfile) + "\n";
+		} else if (lines[i].find("$modules_fileref") != -1) {
+			strnew += lines[i].replace("$modules_fileref", p_config.modules_fileref) + "\n";
+		} else if (lines[i].find("$modules_buildphase") != -1) {
+			strnew += lines[i].replace("$modules_buildphase", p_config.modules_buildphase) + "\n";
+		} else if (lines[i].find("$modules_buildgrp") != -1) {
+			strnew += lines[i].replace("$modules_buildgrp", p_config.modules_buildgrp) + "\n";
+		} else if (lines[i].find("$name") != -1) {
+			strnew += lines[i].replace("$name", p_config.pkg_name) + "\n";
+		} else if (lines[i].find("$info") != -1) {
+			strnew += lines[i].replace("$info", p_preset->get("application/info")) + "\n";
+		} else if (lines[i].find("$bundle_identifier") != -1) {
+			strnew += lines[i].replace("$bundle_identifier", p_preset->get("application/bundle_identifier")) + "\n";
+		} else if (lines[i].find("$short_version") != -1) {
+			strnew += lines[i].replace("$short_version", p_preset->get("application/short_version")) + "\n";
+		} else if (lines[i].find("$version") != -1) {
+			strnew += lines[i].replace("$version", p_preset->get("application/version")) + "\n";
+		} else if (lines[i].find("$signature") != -1) {
+			strnew += lines[i].replace("$signature", p_preset->get("application/signature")) + "\n";
+		} else if (lines[i].find("$copyright") != -1) {
+			strnew += lines[i].replace("$copyright", p_preset->get("application/copyright")) + "\n";
+		} else if (lines[i].find("$team_id") != -1) {
+			strnew += lines[i].replace("$team_id", p_preset->get("application/app_store_team_id")) + "\n";
+		} else if (lines[i].find("$default_build_config") != -1) {
+			strnew += lines[i].replace("$default_build_config", p_debug ? "Debug" : "Release") + "\n";
+		} else if (lines[i].find("$export_method") != -1) {
+			int export_method = p_preset->get(p_debug ? "application/export_method_debug" : "application/export_method_release");
+			strnew += lines[i].replace("$export_method", export_method_string[export_method]) + "\n";
+		} else if (lines[i].find("$provisioning_profile_uuid_release") != -1) {
+			strnew += lines[i].replace("$provisioning_profile_uuid_release", p_preset->get("application/provisioning_profile_uuid_release")) + "\n";
+		} else if (lines[i].find("$provisioning_profile_uuid_debug") != -1) {
+			strnew += lines[i].replace("$provisioning_profile_uuid_debug", p_preset->get("application/provisioning_profile_uuid_debug")) + "\n";
+		} else if (lines[i].find("$provisioning_profile_uuid") != -1) {
+			String uuid = p_debug ? p_preset->get("application/provisioning_profile_uuid_debug") : p_preset->get("application/provisioning_profile_uuid_release");
+			strnew += lines[i].replace("$provisioning_profile_uuid", uuid) + "\n";
+		} else if (lines[i].find("$code_sign_identity_debug") != -1) {
+			strnew += lines[i].replace("$code_sign_identity_debug", p_preset->get("application/code_sign_identity_debug")) + "\n";
+		} else if (lines[i].find("$code_sign_identity_release") != -1) {
+			strnew += lines[i].replace("$code_sign_identity_release", p_preset->get("application/code_sign_identity_release")) + "\n";
+		} else if (lines[i].find("$additional_plist_content") != -1) {
+			strnew += lines[i].replace("$additional_plist_content", p_config.plist_content) + "\n";
+		} else if (lines[i].find("$godot_archs") != -1) {
+			strnew += lines[i].replace("$godot_archs", p_config.architectures) + "\n";
+		} else if (lines[i].find("$linker_flags") != -1) {
+			strnew += lines[i].replace("$linker_flags", p_config.linker_flags) + "\n";
+		} else if (lines[i].find("$targeted_device_family") != -1) {
+			String xcode_value;
+			switch ((int)p_preset->get("application/targeted_device_family")) {
+				case 0: // iPhone
+					xcode_value = "1";
+					break;
+				case 1: // iPad
+					xcode_value = "2";
+					break;
+				case 2: // iPhone & iPad
+					xcode_value = "1,2";
+					break;
+			}
+			strnew += lines[i].replace("$targeted_device_family", xcode_value) + "\n";
+		} else if (lines[i].find("$cpp_code") != -1) {
+			strnew += lines[i].replace("$cpp_code", p_config.cpp_code) + "\n";
+		} else if (lines[i].find("$docs_in_place") != -1) {
+			strnew += lines[i].replace("$docs_in_place", ((bool)p_preset->get("user_data/accessible_from_files_app")) ? "<true/>" : "<false/>") + "\n";
+		} else if (lines[i].find("$docs_sharing") != -1) {
+			strnew += lines[i].replace("$docs_sharing", ((bool)p_preset->get("user_data/accessible_from_itunes_sharing")) ? "<true/>" : "<false/>") + "\n";
+		} else if (lines[i].find("$entitlements_push_notifications") != -1) {
+			bool is_on = p_preset->get("capabilities/push_notifications");
+			strnew += lines[i].replace("$entitlements_push_notifications", is_on ? "<key>aps-environment</key><string>development</string>" : "") + "\n";
+		} else if (lines[i].find("$required_device_capabilities") != -1) {
+			String capabilities;
+
+			// I've removed armv7 as we can run on 64bit only devices
+			// Note that capabilities listed here are requirements for the app to be installed.
+			// They don't enable anything.
+			Vector<String> capabilities_list = p_config.capabilities;
+
+			if ((bool)p_preset->get("capabilities/access_wifi") && !capabilities_list.has("wifi")) {
+				capabilities_list.push_back("wifi");
+			}
+
+			for (int idx = 0; idx < capabilities_list.size(); idx++) {
+				capabilities += "<string>" + capabilities_list[idx] + "</string>\n";
+			}
+
+			strnew += lines[i].replace("$required_device_capabilities", capabilities);
+		} else if (lines[i].find("$interface_orientations") != -1) {
+			String orientations;
+			const DisplayServer::ScreenOrientation screen_orientation =
+					DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation")));
+
+			switch (screen_orientation) {
+				case DisplayServer::SCREEN_LANDSCAPE:
+					orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
+					break;
+				case DisplayServer::SCREEN_PORTRAIT:
+					orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
+					break;
+				case DisplayServer::SCREEN_REVERSE_LANDSCAPE:
+					orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
+					break;
+				case DisplayServer::SCREEN_REVERSE_PORTRAIT:
+					orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
+					break;
+				case DisplayServer::SCREEN_SENSOR_LANDSCAPE:
+					// Allow both landscape orientations depending on sensor direction.
+					orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
+					orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
+					break;
+				case DisplayServer::SCREEN_SENSOR_PORTRAIT:
+					// Allow both portrait orientations depending on sensor direction.
+					orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
+					orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
+					break;
+				case DisplayServer::SCREEN_SENSOR:
+					// Allow all screen orientations depending on sensor direction.
+					orientations += "<string>UIInterfaceOrientationLandscapeLeft</string>\n";
+					orientations += "<string>UIInterfaceOrientationLandscapeRight</string>\n";
+					orientations += "<string>UIInterfaceOrientationPortrait</string>\n";
+					orientations += "<string>UIInterfaceOrientationPortraitUpsideDown</string>\n";
+					break;
+			}
+
+			strnew += lines[i].replace("$interface_orientations", orientations);
+		} else if (lines[i].find("$camera_usage_description") != -1) {
+			String description = p_preset->get("privacy/camera_usage_description");
+			strnew += lines[i].replace("$camera_usage_description", description) + "\n";
+		} else if (lines[i].find("$microphone_usage_description") != -1) {
+			String description = p_preset->get("privacy/microphone_usage_description");
+			strnew += lines[i].replace("$microphone_usage_description", description) + "\n";
+		} else if (lines[i].find("$photolibrary_usage_description") != -1) {
+			String description = p_preset->get("privacy/photolibrary_usage_description");
+			strnew += lines[i].replace("$photolibrary_usage_description", description) + "\n";
+		} else if (lines[i].find("$plist_launch_screen_name") != -1) {
+			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
+			String value = is_on ? "<key>UILaunchStoryboardName</key>\n<string>Launch Screen</string>" : "";
+			strnew += lines[i].replace("$plist_launch_screen_name", value) + "\n";
+		} else if (lines[i].find("$pbx_launch_screen_file_reference") != -1) {
+			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
+			String value = is_on ? "90DD2D9D24B36E8000717FE1 = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = \"Launch Screen.storyboard\"; sourceTree = \"<group>\"; };" : "";
+			strnew += lines[i].replace("$pbx_launch_screen_file_reference", value) + "\n";
+		} else if (lines[i].find("$pbx_launch_screen_copy_files") != -1) {
+			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
+			String value = is_on ? "90DD2D9D24B36E8000717FE1 /* Launch Screen.storyboard */," : "";
+			strnew += lines[i].replace("$pbx_launch_screen_copy_files", value) + "\n";
+		} else if (lines[i].find("$pbx_launch_screen_build_phase") != -1) {
+			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
+			String value = is_on ? "90DD2D9E24B36E8000717FE1 /* Launch Screen.storyboard in Resources */," : "";
+			strnew += lines[i].replace("$pbx_launch_screen_build_phase", value) + "\n";
+		} else if (lines[i].find("$pbx_launch_screen_build_reference") != -1) {
+			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
+			String value = is_on ? "90DD2D9E24B36E8000717FE1 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 90DD2D9D24B36E8000717FE1 /* Launch Screen.storyboard */; };" : "";
+			strnew += lines[i].replace("$pbx_launch_screen_build_reference", value) + "\n";
+		} else if (lines[i].find("$pbx_launch_image_usage_setting") != -1) {
+			bool is_on = p_preset->get("storyboard/use_launch_screen_storyboard");
+			String value = is_on ? "" : "ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;";
+			strnew += lines[i].replace("$pbx_launch_image_usage_setting", value) + "\n";
+		} else if (lines[i].find("$launch_screen_image_mode") != -1) {
+			int image_scale_mode = p_preset->get("storyboard/image_scale_mode");
+			String value;
+
+			switch (image_scale_mode) {
+				case 0: {
+					String logo_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
+					bool is_on = ProjectSettings::get_singleton()->get("application/boot_splash/fullsize");
+					// If custom logo is not specified, Godot does not scale default one, so we should do the same.
+					value = (is_on && logo_path.length() > 0) ? "scaleAspectFit" : "center";
+				} break;
+				default: {
+					value = storyboard_image_scale_mode[image_scale_mode - 1];
+				}
+			}
+
+			strnew += lines[i].replace("$launch_screen_image_mode", value) + "\n";
+		} else if (lines[i].find("$launch_screen_background_color") != -1) {
+			bool use_custom = p_preset->get("storyboard/use_custom_bg_color");
+			Color color = use_custom ? p_preset->get("storyboard/custom_bg_color") : ProjectSettings::get_singleton()->get("application/boot_splash/bg_color");
+			const String value_format = "red=\"$red\" green=\"$green\" blue=\"$blue\" alpha=\"$alpha\"";
+
+			Dictionary value_dictionary;
+			value_dictionary["red"] = color.r;
+			value_dictionary["green"] = color.g;
+			value_dictionary["blue"] = color.b;
+			value_dictionary["alpha"] = color.a;
+			String value = value_format.format(value_dictionary, "$_");
+
+			strnew += lines[i].replace("$launch_screen_background_color", value) + "\n";
+		} else {
+			strnew += lines[i] + "\n";
+		}
+	}
+
+	// !BAS! I'm assuming the 9 in the original code was a typo. I've added -1 or else it seems to also be adding our terminating zero...
+	// should apply the same fix in our OSX export.
+	CharString cs = strnew.utf8();
+	pfile.resize(cs.size() - 1);
+	for (int i = 0; i < cs.size() - 1; i++) {
+		pfile.write[i] = cs[i];
+	}
+}
+
+String EditorExportPlatformIOS::_get_additional_plist_content() {
+	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
+	String result;
+	for (int i = 0; i < export_plugins.size(); ++i) {
+		result += export_plugins[i]->get_ios_plist_content();
+	}
+	return result;
+}
+
+String EditorExportPlatformIOS::_get_linker_flags() {
+	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
+	String result;
+	for (int i = 0; i < export_plugins.size(); ++i) {
+		String flags = export_plugins[i]->get_ios_linker_flags();
+		if (flags.length() == 0) {
+			continue;
+		}
+		if (result.length() > 0) {
+			result += ' ';
+		}
+		result += flags;
+	}
+	// the flags will be enclosed in quotes, so need to escape them
+	return result.replace("\"", "\\\"");
+}
+
+String EditorExportPlatformIOS::_get_cpp_code() {
+	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
+	String result;
+	for (int i = 0; i < export_plugins.size(); ++i) {
+		result += export_plugins[i]->get_ios_cpp_code();
+	}
+	return result;
+}
+
+void EditorExportPlatformIOS::_blend_and_rotate(Ref<Image> &p_dst, Ref<Image> &p_src, bool p_rot) {
+	ERR_FAIL_COND(p_dst.is_null());
+	ERR_FAIL_COND(p_src.is_null());
+
+	int sw = p_rot ? p_src->get_height() : p_src->get_width();
+	int sh = p_rot ? p_src->get_width() : p_src->get_height();
+
+	int x_pos = (p_dst->get_width() - sw) / 2;
+	int y_pos = (p_dst->get_height() - sh) / 2;
+
+	int xs = (x_pos >= 0) ? 0 : -x_pos;
+	int ys = (y_pos >= 0) ? 0 : -y_pos;
+
+	if (sw + x_pos > p_dst->get_width()) {
+		sw = p_dst->get_width() - x_pos;
+	}
+	if (sh + y_pos > p_dst->get_height()) {
+		sh = p_dst->get_height() - y_pos;
+	}
+
+	for (int y = ys; y < sh; y++) {
+		for (int x = xs; x < sw; x++) {
+			Color sc = p_rot ? p_src->get_pixel(p_src->get_width() - y - 1, x) : p_src->get_pixel(x, y);
+			Color dc = p_dst->get_pixel(x_pos + x, y_pos + y);
+			dc.r = (double)(sc.a * sc.r + dc.a * (1.0 - sc.a) * dc.r);
+			dc.g = (double)(sc.a * sc.g + dc.a * (1.0 - sc.a) * dc.g);
+			dc.b = (double)(sc.a * sc.b + dc.a * (1.0 - sc.a) * dc.b);
+			dc.a = (double)(sc.a + dc.a * (1.0 - sc.a));
+			p_dst->set_pixel(x_pos + x, y_pos + y, dc);
+		}
+	}
+}
+
+struct IconInfo {
+	const char *preset_key;
+	const char *idiom;
+	const char *export_name;
+	const char *actual_size_side;
+	const char *scale;
+	const char *unscaled_size;
+	bool is_required = false;
+};
+
+static const IconInfo icon_infos[] = {
+	{ "required_icons/iphone_120x120", "iphone", "Icon-120.png", "120", "2x", "60x60", true },
+	{ "required_icons/iphone_120x120", "iphone", "Icon-120.png", "120", "3x", "40x40", true },
+
+	{ "required_icons/ipad_76x76", "ipad", "Icon-76.png", "76", "1x", "76x76", true },
+	{ "required_icons/app_store_1024x1024", "ios-marketing", "Icon-1024.png", "1024", "1x", "1024x1024", true },
+
+	{ "optional_icons/iphone_180x180", "iphone", "Icon-180.png", "180", "3x", "60x60", false },
+
+	{ "optional_icons/ipad_152x152", "ipad", "Icon-152.png", "152", "2x", "76x76", false },
+
+	{ "optional_icons/ipad_167x167", "ipad", "Icon-167.png", "167", "2x", "83.5x83.5", false },
+
+	{ "optional_icons/spotlight_40x40", "ipad", "Icon-40.png", "40", "1x", "40x40", false },
+
+	{ "optional_icons/spotlight_80x80", "iphone", "Icon-80.png", "80", "2x", "40x40", false },
+	{ "optional_icons/spotlight_80x80", "ipad", "Icon-80.png", "80", "2x", "40x40", false }
+};
+
+Error EditorExportPlatformIOS::_export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir) {
+	String json_description = "{\"images\":[";
+	String sizes;
+
+	DirAccess *da = DirAccess::open(p_iconset_dir);
+	ERR_FAIL_COND_V_MSG(!da, ERR_CANT_OPEN, "Cannot open directory '" + p_iconset_dir + "'.");
+
+	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
+		IconInfo info = icon_infos[i];
+		int side_size = String(info.actual_size_side).to_int();
+		String icon_path = p_preset->get(info.preset_key);
+		if (icon_path.length() == 0) {
+			if ((bool)p_preset->get("icons/generate_missing")) {
+				// Resize main app icon
+				icon_path = ProjectSettings::get_singleton()->get("application/config/icon");
+				Ref<Image> img = memnew(Image);
+				Error err = ImageLoader::load_image(icon_path, img);
+				if (err != OK) {
+					ERR_PRINT("Invalid icon (" + String(info.preset_key) + "): '" + icon_path + "'.");
+					return ERR_UNCONFIGURED;
+				}
+				img->resize(side_size, side_size);
+				err = img->save_png(p_iconset_dir + info.export_name);
+				if (err) {
+					String err_str = String("Failed to export icon(" + String(info.preset_key) + "): '" + icon_path + "'.");
+					ERR_PRINT(err_str.utf8().get_data());
+					return err;
+				}
+			} else {
+				if (info.is_required) {
+					String err_str = String("Required icon (") + info.preset_key + ") is not specified in the preset.";
+					ERR_PRINT(err_str);
+					return ERR_UNCONFIGURED;
+				} else {
+					String err_str = String("Icon (") + info.preset_key + ") is not specified in the preset.";
+					WARN_PRINT(err_str);
+				}
+				continue;
+			}
+		} else {
+			// Load custom icon
+			Ref<Image> img = memnew(Image);
+			Error err = ImageLoader::load_image(icon_path, img);
+			if (err != OK) {
+				ERR_PRINT("Invalid icon (" + String(info.preset_key) + "): '" + icon_path + "'.");
+				return ERR_UNCONFIGURED;
+			}
+			if (img->get_width() != side_size || img->get_height() != side_size) {
+				ERR_PRINT("Invalid icon size (" + String(info.preset_key) + "): '" + icon_path + "'.");
+				return ERR_UNCONFIGURED;
+			}
+
+			err = da->copy(icon_path, p_iconset_dir + info.export_name);
+			if (err) {
+				memdelete(da);
+				String err_str = String("Failed to export icon(" + String(info.preset_key) + "): '" + icon_path + "'.");
+				ERR_PRINT(err_str.utf8().get_data());
+				return err;
+			}
+		}
+		sizes += String(info.actual_size_side) + "\n";
+		if (i > 0) {
+			json_description += ",";
+		}
+		json_description += String("{");
+		json_description += String("\"idiom\":") + "\"" + info.idiom + "\",";
+		json_description += String("\"size\":") + "\"" + info.unscaled_size + "\",";
+		json_description += String("\"scale\":") + "\"" + info.scale + "\",";
+		json_description += String("\"filename\":") + "\"" + info.export_name + "\"";
+		json_description += String("}");
+	}
+	json_description += "]}";
+	memdelete(da);
+
+	FileAccess *json_file = FileAccess::open(p_iconset_dir + "Contents.json", FileAccess::WRITE);
+	ERR_FAIL_COND_V(!json_file, ERR_CANT_CREATE);
+	CharString json_utf8 = json_description.utf8();
+	json_file->store_buffer((const uint8_t *)json_utf8.get_data(), json_utf8.length());
+	memdelete(json_file);
+
+	FileAccess *sizes_file = FileAccess::open(p_iconset_dir + "sizes", FileAccess::WRITE);
+	ERR_FAIL_COND_V(!sizes_file, ERR_CANT_CREATE);
+	CharString sizes_utf8 = sizes.utf8();
+	sizes_file->store_buffer((const uint8_t *)sizes_utf8.get_data(), sizes_utf8.length());
+	memdelete(sizes_file);
+
+	return OK;
+}
+
+Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir) {
+	const String custom_launch_image_2x = p_preset->get("storyboard/custom_image@2x");
+	const String custom_launch_image_3x = p_preset->get("storyboard/custom_image@3x");
+
+	if (custom_launch_image_2x.length() > 0 && custom_launch_image_3x.length() > 0) {
+		Ref<Image> image;
+		String image_path = p_dest_dir.plus_file("splash@2x.png");
+		image.instantiate();
+		Error err = image->load(custom_launch_image_2x);
+
+		if (err) {
+			image.unref();
+			return err;
+		}
+
+		if (image->save_png(image_path) != OK) {
+			return ERR_FILE_CANT_WRITE;
+		}
+
+		image.unref();
+		image_path = p_dest_dir.plus_file("splash@3x.png");
+		image.instantiate();
+		err = image->load(custom_launch_image_3x);
+
+		if (err) {
+			image.unref();
+			return err;
+		}
+
+		if (image->save_png(image_path) != OK) {
+			return ERR_FILE_CANT_WRITE;
+		}
+	} else {
+		Ref<Image> splash;
+
+		const String splash_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
+
+		if (!splash_path.is_empty()) {
+			splash.instantiate();
+			const Error err = splash->load(splash_path);
+			if (err) {
+				splash.unref();
+			}
+		}
+
+		if (splash.is_null()) {
+			splash = Ref<Image>(memnew(Image(boot_splash_png)));
+		}
+
+		// Using same image for both @2x and @3x
+		// because Godot's own boot logo uses single image for all resolutions.
+		// Also not using @1x image, because devices using this image variant
+		// are not supported by iOS 9, which is minimal target.
+		const String splash_png_path_2x = p_dest_dir.plus_file("splash@2x.png");
+		const String splash_png_path_3x = p_dest_dir.plus_file("splash@3x.png");
+
+		if (splash->save_png(splash_png_path_2x) != OK) {
+			return ERR_FILE_CANT_WRITE;
+		}
+
+		if (splash->save_png(splash_png_path_3x) != OK) {
+			return ERR_FILE_CANT_WRITE;
+		}
+	}
+
+	return OK;
+}
+
+Error EditorExportPlatformIOS::_export_loading_screen_images(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir) {
+	DirAccess *da = DirAccess::open(p_dest_dir);
+	ERR_FAIL_COND_V_MSG(!da, ERR_CANT_OPEN, "Cannot open directory '" + p_dest_dir + "'.");
+
+	for (uint64_t i = 0; i < sizeof(loading_screen_infos) / sizeof(loading_screen_infos[0]); ++i) {
+		LoadingScreenInfo info = loading_screen_infos[i];
+		String loading_screen_file = p_preset->get(info.preset_key);
+		if (loading_screen_file.size() > 0) {
+			// Load custom loading screens
+			Ref<Image> img = memnew(Image);
+			Error err = ImageLoader::load_image(loading_screen_file, img);
+			if (err != OK) {
+				ERR_PRINT("Invalid loading screen (" + String(info.preset_key) + "): '" + loading_screen_file + "'.");
+				return ERR_UNCONFIGURED;
+			}
+			if (img->get_width() != info.width || img->get_height() != info.height) {
+				ERR_PRINT("Invalid loading screen size (" + String(info.preset_key) + "): '" + loading_screen_file + "'.");
+				return ERR_UNCONFIGURED;
+			}
+			err = da->copy(loading_screen_file, p_dest_dir + info.export_name);
+			if (err) {
+				memdelete(da);
+				String err_str = String("Failed to export loading screen (") + info.preset_key + ") from path '" + loading_screen_file + "'.";
+				ERR_PRINT(err_str.utf8().get_data());
+				return err;
+			}
+		} else if ((bool)p_preset->get("launch_screens/generate_missing")) {
+			// Generate loading screen from the splash screen
+			Color boot_bg_color = ProjectSettings::get_singleton()->get("application/boot_splash/bg_color");
+			String boot_logo_path = ProjectSettings::get_singleton()->get("application/boot_splash/image");
+			bool boot_logo_scale = ProjectSettings::get_singleton()->get("application/boot_splash/fullsize");
+
+			Ref<Image> img = memnew(Image);
+			img->create(info.width, info.height, false, Image::FORMAT_RGBA8);
+			img->fill(boot_bg_color);
+
+			Ref<Image> img_bs;
+
+			if (boot_logo_path.length() > 0) {
+				img_bs = Ref<Image>(memnew(Image));
+				ImageLoader::load_image(boot_logo_path, img_bs);
+			}
+			if (!img_bs.is_valid()) {
+				img_bs = Ref<Image>(memnew(Image(boot_splash_png)));
+			}
+			if (img_bs.is_valid()) {
+				float aspect_ratio = (float)img_bs->get_width() / (float)img_bs->get_height();
+				if (info.rotate) {
+					if (boot_logo_scale) {
+						if (info.width * aspect_ratio <= info.height) {
+							img_bs->resize(info.width * aspect_ratio, info.width);
+						} else {
+							img_bs->resize(info.height, info.height / aspect_ratio);
+						}
+					}
+				} else {
+					if (boot_logo_scale) {
+						if (info.height * aspect_ratio <= info.width) {
+							img_bs->resize(info.height * aspect_ratio, info.height);
+						} else {
+							img_bs->resize(info.width, info.width / aspect_ratio);
+						}
+					}
+				}
+				_blend_and_rotate(img, img_bs, info.rotate);
+			}
+			Error err = img->save_png(p_dest_dir + info.export_name);
+			if (err) {
+				String err_str = String("Failed to export loading screen (") + info.preset_key + ") from splash screen.";
+				WARN_PRINT(err_str.utf8().get_data());
+			}
+		} else {
+			String err_str = String("No loading screen (") + info.preset_key + ") specified.";
+			WARN_PRINT(err_str.utf8().get_data());
+		}
+	}
+	memdelete(da);
+
+	return OK;
+}
+
+Error EditorExportPlatformIOS::_walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata) {
+	Vector<String> dirs;
+	String path;
+	String current_dir = p_da->get_current_dir();
+	p_da->list_dir_begin();
+	while ((path = p_da->get_next()).length() != 0) {
+		if (p_da->current_is_dir()) {
+			if (path != "." && path != "..") {
+				dirs.push_back(path);
+			}
+		} else {
+			Error err = p_handler(current_dir.plus_file(path), p_userdata);
+			if (err) {
+				p_da->list_dir_end();
+				return err;
+			}
+		}
+	}
+	p_da->list_dir_end();
+
+	for (int i = 0; i < dirs.size(); ++i) {
+		String dir = dirs[i];
+		p_da->change_dir(dir);
+		Error err = _walk_dir_recursive(p_da, p_handler, p_userdata);
+		p_da->change_dir("..");
+		if (err) {
+			return err;
+		}
+	}
+
+	return OK;
+}
+
+struct CodesignData {
+	const Ref<EditorExportPreset> &preset;
+	bool debug = false;
+
+	CodesignData(const Ref<EditorExportPreset> &p_preset, bool p_debug) :
+			preset(p_preset),
+			debug(p_debug) {
+	}
+};
+
+Error EditorExportPlatformIOS::_codesign(String p_file, void *p_userdata) {
+	if (p_file.ends_with(".dylib")) {
+		CodesignData *data = (CodesignData *)p_userdata;
+		print_line(String("Signing ") + p_file);
+		List<String> codesign_args;
+		codesign_args.push_back("-f");
+		codesign_args.push_back("-s");
+		codesign_args.push_back(data->preset->get(data->debug ? "application/code_sign_identity_debug" : "application/code_sign_identity_release"));
+		codesign_args.push_back(p_file);
+		return OS::get_singleton()->execute("codesign", codesign_args);
+	}
+	return OK;
+}
+
+struct PbxId {
+private:
+	static char _hex_char(uint8_t four_bits) {
+		if (four_bits < 10) {
+			return ('0' + four_bits);
+		}
+		return 'A' + (four_bits - 10);
+	}
+
+	static String _hex_pad(uint32_t num) {
+		Vector<char> ret;
+		ret.resize(sizeof(num) * 2);
+		for (uint64_t i = 0; i < sizeof(num) * 2; ++i) {
+			uint8_t four_bits = (num >> (sizeof(num) * 8 - (i + 1) * 4)) & 0xF;
+			ret.write[i] = _hex_char(four_bits);
+		}
+		return String::utf8(ret.ptr(), ret.size());
+	}
+
+public:
+	uint32_t high_bits;
+	uint32_t mid_bits;
+	uint32_t low_bits;
+
+	String str() const {
+		return _hex_pad(high_bits) + _hex_pad(mid_bits) + _hex_pad(low_bits);
+	}
+
+	PbxId &operator++() {
+		low_bits++;
+		if (!low_bits) {
+			mid_bits++;
+			if (!mid_bits) {
+				high_bits++;
+			}
+		}
+
+		return *this;
+	}
+};
+
+struct ExportLibsData {
+	Vector<String> lib_paths;
+	String dest_dir;
+};
+
+void EditorExportPlatformIOS::_add_assets_to_project(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_project_data, const Vector<IOSExportAsset> &p_additional_assets) {
+	// that is just a random number, we just need Godot IDs not to clash with
+	// existing IDs in the project.
+	PbxId current_id = { 0x58938401, 0, 0 };
+	String pbx_files;
+	String pbx_frameworks_build;
+	String pbx_frameworks_refs;
+	String pbx_resources_build;
+	String pbx_resources_refs;
+	String pbx_embeded_frameworks;
+
+	const String file_info_format = String("$build_id = {isa = PBXBuildFile; fileRef = $ref_id; };\n") +
+									"$ref_id = {isa = PBXFileReference; lastKnownFileType = $file_type; name = \"$name\"; path = \"$file_path\"; sourceTree = \"<group>\"; };\n";
+
+	for (int i = 0; i < p_additional_assets.size(); ++i) {
+		String additional_asset_info_format = file_info_format;
+
+		String build_id = (++current_id).str();
+		String ref_id = (++current_id).str();
+		String framework_id = "";
+
+		const IOSExportAsset &asset = p_additional_assets[i];
+
+		String type;
+		if (asset.exported_path.ends_with(".framework")) {
+			if (asset.should_embed) {
+				additional_asset_info_format += "$framework_id = {isa = PBXBuildFile; fileRef = $ref_id; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };\n";
+				framework_id = (++current_id).str();
+				pbx_embeded_frameworks += framework_id + ",\n";
+			}
+
+			type = "wrapper.framework";
+		} else if (asset.exported_path.ends_with(".xcframework")) {
+			if (asset.should_embed) {
+				additional_asset_info_format += "$framework_id = {isa = PBXBuildFile; fileRef = $ref_id; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };\n";
+				framework_id = (++current_id).str();
+				pbx_embeded_frameworks += framework_id + ",\n";
+			}
+
+			type = "wrapper.xcframework";
+		} else if (asset.exported_path.ends_with(".dylib")) {
+			type = "compiled.mach-o.dylib";
+		} else if (asset.exported_path.ends_with(".a")) {
+			type = "archive.ar";
+		} else {
+			type = "file";
+		}
+
+		String &pbx_build = asset.is_framework ? pbx_frameworks_build : pbx_resources_build;
+		String &pbx_refs = asset.is_framework ? pbx_frameworks_refs : pbx_resources_refs;
+
+		if (pbx_build.length() > 0) {
+			pbx_build += ",\n";
+			pbx_refs += ",\n";
+		}
+		pbx_build += build_id;
+		pbx_refs += ref_id;
+
+		Dictionary format_dict;
+		format_dict["build_id"] = build_id;
+		format_dict["ref_id"] = ref_id;
+		format_dict["name"] = asset.exported_path.get_file();
+		format_dict["file_path"] = asset.exported_path;
+		format_dict["file_type"] = type;
+		if (framework_id.length() > 0) {
+			format_dict["framework_id"] = framework_id;
+		}
+		pbx_files += additional_asset_info_format.format(format_dict, "$_");
+	}
+
+	// Note, frameworks like gamekit are always included in our project.pbxprof file
+	// even if turned off in capabilities.
+
+	String str = String::utf8((const char *)p_project_data.ptr(), p_project_data.size());
+	str = str.replace("$additional_pbx_files", pbx_files);
+	str = str.replace("$additional_pbx_frameworks_build", pbx_frameworks_build);
+	str = str.replace("$additional_pbx_frameworks_refs", pbx_frameworks_refs);
+	str = str.replace("$additional_pbx_resources_build", pbx_resources_build);
+	str = str.replace("$additional_pbx_resources_refs", pbx_resources_refs);
+	str = str.replace("$pbx_embeded_frameworks", pbx_embeded_frameworks);
+
+	CharString cs = str.utf8();
+	p_project_data.resize(cs.size() - 1);
+	for (int i = 0; i < cs.size() - 1; i++) {
+		p_project_data.write[i] = cs[i];
+	}
+}
+
+Error EditorExportPlatformIOS::_copy_asset(const String &p_out_dir, const String &p_asset, const String *p_custom_file_name, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets) {
+	DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	ERR_FAIL_COND_V_MSG(!filesystem_da, ERR_CANT_CREATE, "Cannot create DirAccess for path '" + p_out_dir + "'.");
+
+	String binary_name = p_out_dir.get_file().get_basename();
+
+	DirAccess *da = DirAccess::create_for_path(p_asset);
+	if (!da) {
+		memdelete(filesystem_da);
+		ERR_FAIL_V_MSG(ERR_CANT_CREATE, "Can't create directory: " + p_asset + ".");
+	}
+	bool file_exists = da->file_exists(p_asset);
+	bool dir_exists = da->dir_exists(p_asset);
+	if (!file_exists && !dir_exists) {
+		memdelete(da);
+		memdelete(filesystem_da);
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	String base_dir = p_asset.get_base_dir().replace("res://", "");
+	String destination_dir;
+	String destination;
+	String asset_path;
+
+	bool create_framework = false;
+
+	if (p_is_framework && p_asset.ends_with(".dylib")) {
+		// For iOS we need to turn .dylib into .framework
+		// to be able to send application to AppStore
+		asset_path = String("dylibs").plus_file(base_dir);
+
+		String file_name;
+
+		if (!p_custom_file_name) {
+			file_name = p_asset.get_basename().get_file();
+		} else {
+			file_name = *p_custom_file_name;
+		}
+
+		String framework_name = file_name + ".framework";
+
+		asset_path = asset_path.plus_file(framework_name);
+		destination_dir = p_out_dir.plus_file(asset_path);
+		destination = destination_dir.plus_file(file_name);
+		create_framework = true;
+	} else if (p_is_framework && (p_asset.ends_with(".framework") || p_asset.ends_with(".xcframework"))) {
+		asset_path = String("dylibs").plus_file(base_dir);
+
+		String file_name;
+
+		if (!p_custom_file_name) {
+			file_name = p_asset.get_file();
+		} else {
+			file_name = *p_custom_file_name;
+		}
+
+		asset_path = asset_path.plus_file(file_name);
+		destination_dir = p_out_dir.plus_file(asset_path);
+		destination = destination_dir;
+	} else {
+		asset_path = base_dir;
+
+		String file_name;
+
+		if (!p_custom_file_name) {
+			file_name = p_asset.get_file();
+		} else {
+			file_name = *p_custom_file_name;
+		}
+
+		destination_dir = p_out_dir.plus_file(asset_path);
+		asset_path = asset_path.plus_file(file_name);
+		destination = p_out_dir.plus_file(asset_path);
+	}
+
+	if (!filesystem_da->dir_exists(destination_dir)) {
+		Error make_dir_err = filesystem_da->make_dir_recursive(destination_dir);
+		if (make_dir_err) {
+			memdelete(da);
+			memdelete(filesystem_da);
+			return make_dir_err;
+		}
+	}
+
+	Error err = dir_exists ? da->copy_dir(p_asset, destination) : da->copy(p_asset, destination);
+	memdelete(da);
+	if (err) {
+		memdelete(filesystem_da);
+		return err;
+	}
+	IOSExportAsset exported_asset = { binary_name.plus_file(asset_path), p_is_framework, p_should_embed };
+	r_exported_assets.push_back(exported_asset);
+
+	if (create_framework) {
+		String file_name;
+
+		if (!p_custom_file_name) {
+			file_name = p_asset.get_basename().get_file();
+		} else {
+			file_name = *p_custom_file_name;
+		}
+
+		String framework_name = file_name + ".framework";
+
+		// Performing `install_name_tool -id @rpath/{name}.framework/{name} ./{name}` on dylib
+		{
+			List<String> install_name_args;
+			install_name_args.push_back("-id");
+			install_name_args.push_back(String("@rpath").plus_file(framework_name).plus_file(file_name));
+			install_name_args.push_back(destination);
+
+			OS::get_singleton()->execute("install_name_tool", install_name_args);
+		}
+
+		// Creating Info.plist
+		{
+			String info_plist_format = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+									   "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+									   "<plist version=\"1.0\">\n"
+									   "<dict>\n"
+									   "<key>CFBundleShortVersionString</key>\n"
+									   "<string>1.0</string>\n"
+									   "<key>CFBundleIdentifier</key>\n"
+									   "<string>com.gdnative.framework.$name</string>\n"
+									   "<key>CFBundleName</key>\n"
+									   "<string>$name</string>\n"
+									   "<key>CFBundleExecutable</key>\n"
+									   "<string>$name</string>\n"
+									   "<key>DTPlatformName</key>\n"
+									   "<string>iphoneos</string>\n"
+									   "<key>CFBundleInfoDictionaryVersion</key>\n"
+									   "<string>6.0</string>\n"
+									   "<key>CFBundleVersion</key>\n"
+									   "<string>1</string>\n"
+									   "<key>CFBundlePackageType</key>\n"
+									   "<string>FMWK</string>\n"
+									   "<key>MinimumOSVersion</key>\n"
+									   "<string>10.0</string>\n"
+									   "</dict>\n"
+									   "</plist>";
+
+			String info_plist = info_plist_format.replace("$name", file_name);
+
+			FileAccess *f = FileAccess::open(destination_dir.plus_file("Info.plist"), FileAccess::WRITE);
+			if (f) {
+				f->store_string(info_plist);
+				f->close();
+				memdelete(f);
+			}
+		}
+	}
+
+	memdelete(filesystem_da);
+
+	return OK;
+}
+
+Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets) {
+	for (int f_idx = 0; f_idx < p_assets.size(); ++f_idx) {
+		String asset = p_assets[f_idx];
+		if (!asset.begins_with("res://")) {
+			// either SDK-builtin or already a part of the export template
+			IOSExportAsset exported_asset = { asset, p_is_framework, p_should_embed };
+			r_exported_assets.push_back(exported_asset);
+		} else {
+			Error err = _copy_asset(p_out_dir, asset, nullptr, p_is_framework, p_should_embed, r_exported_assets);
+			ERR_FAIL_COND_V(err, err);
+		}
+	}
+
+	return OK;
+}
+
+Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<IOSExportAsset> &r_exported_assets) {
+	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
+	for (int i = 0; i < export_plugins.size(); i++) {
+		Vector<String> linked_frameworks = export_plugins[i]->get_ios_frameworks();
+		Error err = _export_additional_assets(p_out_dir, linked_frameworks, true, false, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+
+		Vector<String> embedded_frameworks = export_plugins[i]->get_ios_embedded_frameworks();
+		err = _export_additional_assets(p_out_dir, embedded_frameworks, true, true, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+
+		Vector<String> project_static_libs = export_plugins[i]->get_ios_project_static_libs();
+		for (int j = 0; j < project_static_libs.size(); j++) {
+			project_static_libs.write[j] = project_static_libs[j].get_file(); // Only the file name as it's copied to the project
+		}
+		err = _export_additional_assets(p_out_dir, project_static_libs, true, true, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+
+		Vector<String> ios_bundle_files = export_plugins[i]->get_ios_bundle_files();
+		err = _export_additional_assets(p_out_dir, ios_bundle_files, false, false, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+	}
+
+	Vector<String> library_paths;
+	for (int i = 0; i < p_libraries.size(); ++i) {
+		library_paths.push_back(p_libraries[i].path);
+	}
+	Error err = _export_additional_assets(p_out_dir, library_paths, true, true, r_exported_assets);
+	ERR_FAIL_COND_V(err, err);
+
+	return OK;
+}
+
+Vector<String> EditorExportPlatformIOS::_get_preset_architectures(const Ref<EditorExportPreset> &p_preset) {
+	Vector<ExportArchitecture> all_archs = _get_supported_architectures();
+	Vector<String> enabled_archs;
+	for (int i = 0; i < all_archs.size(); ++i) {
+		bool is_enabled = p_preset->get("architectures/" + all_archs[i].name);
+		if (is_enabled) {
+			enabled_archs.push_back(all_archs[i].name);
+		}
+	}
+	return enabled_archs;
+}
+
+Error EditorExportPlatformIOS::_export_ios_plugins(const Ref<EditorExportPreset> &p_preset, IOSConfigData &p_config_data, const String &dest_dir, Vector<IOSExportAsset> &r_exported_assets, bool p_debug) {
+	String plugin_definition_cpp_code;
+	String plugin_initialization_cpp_code;
+	String plugin_deinitialization_cpp_code;
+
+	Vector<String> plugin_linked_dependencies;
+	Vector<String> plugin_embedded_dependencies;
+	Vector<String> plugin_files;
+
+	Vector<PluginConfigIOS> enabled_plugins = get_enabled_plugins(p_preset);
+
+	Vector<String> added_linked_dependenciy_names;
+	Vector<String> added_embedded_dependenciy_names;
+	HashMap<String, String> plist_values;
+
+	Set<String> plugin_linker_flags;
+
+	Error err;
+
+	for (int i = 0; i < enabled_plugins.size(); i++) {
+		PluginConfigIOS plugin = enabled_plugins[i];
+
+		// Export plugin binary.
+		String plugin_main_binary = PluginConfigIOS::get_plugin_main_binary(plugin, p_debug);
+		String plugin_binary_result_file = plugin.binary.get_file();
+		// We shouldn't embed .xcframework that contains static libraries.
+		// Static libraries are not embedded anyway.
+		err = _copy_asset(dest_dir, plugin_main_binary, &plugin_binary_result_file, true, false, r_exported_assets);
+
+		ERR_FAIL_COND_V(err, err);
+
+		// Adding dependencies.
+		// Use separate container for names to check for duplicates.
+		for (int j = 0; j < plugin.linked_dependencies.size(); j++) {
+			String dependency = plugin.linked_dependencies[j];
+			String name = dependency.get_file();
+
+			if (added_linked_dependenciy_names.has(name)) {
+				continue;
+			}
+
+			added_linked_dependenciy_names.push_back(name);
+			plugin_linked_dependencies.push_back(dependency);
+		}
+
+		for (int j = 0; j < plugin.system_dependencies.size(); j++) {
+			String dependency = plugin.system_dependencies[j];
+			String name = dependency.get_file();
+
+			if (added_linked_dependenciy_names.has(name)) {
+				continue;
+			}
+
+			added_linked_dependenciy_names.push_back(name);
+			plugin_linked_dependencies.push_back(dependency);
+		}
+
+		for (int j = 0; j < plugin.embedded_dependencies.size(); j++) {
+			String dependency = plugin.embedded_dependencies[j];
+			String name = dependency.get_file();
+
+			if (added_embedded_dependenciy_names.has(name)) {
+				continue;
+			}
+
+			added_embedded_dependenciy_names.push_back(name);
+			plugin_embedded_dependencies.push_back(dependency);
+		}
+
+		plugin_files.append_array(plugin.files_to_copy);
+
+		// Capabilities
+		// Also checking for duplicates.
+		for (int j = 0; j < plugin.capabilities.size(); j++) {
+			String capability = plugin.capabilities[j];
+
+			if (p_config_data.capabilities.has(capability)) {
+				continue;
+			}
+
+			p_config_data.capabilities.push_back(capability);
+		}
+
+		// Linker flags
+		// Checking duplicates
+		for (int j = 0; j < plugin.linker_flags.size(); j++) {
+			String linker_flag = plugin.linker_flags[j];
+			plugin_linker_flags.insert(linker_flag);
+		}
+
+		// Plist
+		// Using hash map container to remove duplicates
+		const String *K = nullptr;
+
+		while ((K = plugin.plist.next(K))) {
+			String key = *K;
+			PluginConfigIOS::PlistItem item = plugin.plist[key];
+
+			String value;
+
+			switch (item.type) {
+				case PluginConfigIOS::PlistItemType::STRING_INPUT: {
+					String preset_name = "plugins_plist/" + key;
+					String input_value = p_preset->get(preset_name);
+					value = "<string>" + input_value + "</string>";
+				} break;
+				default:
+					value = item.value;
+					break;
+			}
+
+			if (key.is_empty() || value.is_empty()) {
+				continue;
+			}
+
+			String plist_key = "<key>" + key + "</key>";
+
+			plist_values[plist_key] = value;
+		}
+
+		// CPP Code
+		String definition_comment = "// Plugin: " + plugin.name + "\n";
+		String initialization_method = plugin.initialization_method + "();\n";
+		String deinitialization_method = plugin.deinitialization_method + "();\n";
+
+		plugin_definition_cpp_code += definition_comment +
+									  "extern void " + initialization_method +
+									  "extern void " + deinitialization_method + "\n";
+
+		plugin_initialization_cpp_code += "\t" + initialization_method;
+		plugin_deinitialization_cpp_code += "\t" + deinitialization_method;
+	}
+
+	// Updating `Info.plist`
+	{
+		const String *K = nullptr;
+		while ((K = plist_values.next(K))) {
+			String key = *K;
+			String value = plist_values[key];
+
+			if (key.is_empty() || value.is_empty()) {
+				continue;
+			}
+
+			p_config_data.plist_content += key + value + "\n";
+		}
+	}
+
+	// Export files
+	{
+		// Export linked plugin dependency
+		err = _export_additional_assets(dest_dir, plugin_linked_dependencies, true, false, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+
+		// Export embedded plugin dependency
+		err = _export_additional_assets(dest_dir, plugin_embedded_dependencies, true, true, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+
+		// Export plugin files
+		err = _export_additional_assets(dest_dir, plugin_files, false, false, r_exported_assets);
+		ERR_FAIL_COND_V(err, err);
+	}
+
+	// Update CPP
+	{
+		Dictionary plugin_format;
+		plugin_format["definition"] = plugin_definition_cpp_code;
+		plugin_format["initialization"] = plugin_initialization_cpp_code;
+		plugin_format["deinitialization"] = plugin_deinitialization_cpp_code;
+
+		String plugin_cpp_code = "\n// Godot Plugins\n"
+								 "void godot_ios_plugins_initialize();\n"
+								 "void godot_ios_plugins_deinitialize();\n"
+								 "// Exported Plugins\n\n"
+								 "$definition"
+								 "// Use Plugins\n"
+								 "void godot_ios_plugins_initialize() {\n"
+								 "$initialization"
+								 "}\n\n"
+								 "void godot_ios_plugins_deinitialize() {\n"
+								 "$deinitialization"
+								 "}\n";
+
+		p_config_data.cpp_code += plugin_cpp_code.format(plugin_format, "$_");
+	}
+
+	// Update Linker Flag Values
+	{
+		String result_linker_flags = " ";
+		for (Set<String>::Element *E = plugin_linker_flags.front(); E; E = E->next()) {
+			const String &flag = E->get();
+
+			if (flag.length() == 0) {
+				continue;
+			}
+
+			if (result_linker_flags.length() > 0) {
+				result_linker_flags += ' ';
+			}
+
+			result_linker_flags += flag;
+		}
+		result_linker_flags = result_linker_flags.replace("\"", "\\\"");
+		p_config_data.linker_flags += result_linker_flags;
+	}
+
+	return OK;
+}
+
+Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
+
+	String src_pkg_name;
+	String dest_dir = p_path.get_base_dir() + "/";
+	String binary_name = p_path.get_file().get_basename();
+
+	EditorProgress ep("export", "Exporting for iOS", 5, true);
+
+	String team_id = p_preset->get("application/app_store_team_id");
+	ERR_FAIL_COND_V_MSG(team_id.length() == 0, ERR_CANT_OPEN, "App Store Team ID not specified - cannot configure the project.");
+
+	if (p_debug) {
+		src_pkg_name = p_preset->get("custom_template/debug");
+	} else {
+		src_pkg_name = p_preset->get("custom_template/release");
+	}
+
+	if (src_pkg_name == "") {
+		String err;
+		src_pkg_name = find_export_template("iphone.zip", &err);
+		if (src_pkg_name == "") {
+			EditorNode::add_io_error(err);
+			return ERR_FILE_NOT_FOUND;
+		}
+	}
+
+	if (!DirAccess::exists(dest_dir)) {
+		return ERR_FILE_BAD_PATH;
+	}
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	if (da) {
+		String current_dir = da->get_current_dir();
+
+		// remove leftovers from last export so they don't interfere
+		// in case some files are no longer needed
+		if (da->change_dir(dest_dir + binary_name + ".xcodeproj") == OK) {
+			da->erase_contents_recursive();
+		}
+		if (da->change_dir(dest_dir + binary_name) == OK) {
+			da->erase_contents_recursive();
+		}
+
+		da->change_dir(current_dir);
+
+		if (!da->dir_exists(dest_dir + binary_name)) {
+			Error err = da->make_dir(dest_dir + binary_name);
+			if (err) {
+				memdelete(da);
+				return err;
+			}
+		}
+		memdelete(da);
+	}
+
+	if (ep.step("Making .pck", 0)) {
+		return ERR_SKIP;
+	}
+	String pack_path = dest_dir + binary_name + ".pck";
+	Vector<SharedObject> libraries;
+	Error err = save_pack(p_preset, pack_path, &libraries);
+	if (err) {
+		return err;
+	}
+
+	if (ep.step("Extracting and configuring Xcode project", 1)) {
+		return ERR_SKIP;
+	}
+
+	String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".xcframework";
+
+	print_line("Static framework: " + library_to_use);
+	String pkg_name;
+	if (p_preset->get("application/name") != "") {
+		pkg_name = p_preset->get("application/name"); // app_name
+	} else if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
+		pkg_name = String(ProjectSettings::get_singleton()->get("application/config/name"));
+	} else {
+		pkg_name = "Unnamed";
+	}
+
+	bool found_library = false;
+	int total_size = 0;
+
+	const String project_file = "godot_ios.xcodeproj/project.pbxproj";
+	Set<String> files_to_parse;
+	files_to_parse.insert("godot_ios/godot_ios-Info.plist");
+	files_to_parse.insert(project_file);
+	files_to_parse.insert("godot_ios/export_options.plist");
+	files_to_parse.insert("godot_ios/dummy.cpp");
+	files_to_parse.insert("godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata");
+	files_to_parse.insert("godot_ios.xcodeproj/xcshareddata/xcschemes/godot_ios.xcscheme");
+	files_to_parse.insert("godot_ios/godot_ios.entitlements");
+	files_to_parse.insert("godot_ios/Launch Screen.storyboard");
+
+	IOSConfigData config_data = {
+		pkg_name,
+		binary_name,
+		_get_additional_plist_content(),
+		String(" ").join(_get_preset_architectures(p_preset)),
+		_get_linker_flags(),
+		_get_cpp_code(),
+		"",
+		"",
+		"",
+		"",
+		Vector<String>()
+	};
+
+	Vector<IOSExportAsset> assets;
+
+	DirAccess *tmp_app_path = DirAccess::create_for_path(dest_dir);
+	ERR_FAIL_COND_V(!tmp_app_path, ERR_CANT_CREATE);
+
+	print_line("Unzipping...");
+	FileAccess *src_f = nullptr;
+	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
+	unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io);
+	if (!src_pkg_zip) {
+		EditorNode::add_io_error("Could not open export template (not a zip file?):\n" + src_pkg_name);
+		return ERR_CANT_OPEN;
+	}
+
+	err = _export_ios_plugins(p_preset, config_data, dest_dir + binary_name, assets, p_debug);
+	ERR_FAIL_COND_V(err, err);
+
+	//export rest of the files
+	int ret = unzGoToFirstFile(src_pkg_zip);
+	Vector<uint8_t> project_file_data;
+	while (ret == UNZ_OK) {
+#if defined(OSX_ENABLED) || defined(X11_ENABLED)
+		bool is_execute = false;
+#endif
+
+		//get filename
+		unz_file_info info;
+		char fname[16384];
+		ret = unzGetCurrentFileInfo(src_pkg_zip, &info, fname, 16384, nullptr, 0, nullptr, 0);
+
+		String file = fname;
+
+		print_line("READ: " + file);
+		Vector<uint8_t> data;
+		data.resize(info.uncompressed_size);
+
+		//read
+		unzOpenCurrentFile(src_pkg_zip);
+		unzReadCurrentFile(src_pkg_zip, data.ptrw(), data.size());
+		unzCloseCurrentFile(src_pkg_zip);
+
+		//write
+
+		file = file.replace_first("iphone/", "");
+
+		if (files_to_parse.has(file)) {
+			_fix_config_file(p_preset, data, config_data, p_debug);
+		} else if (file.begins_with("libgodot.iphone")) {
+			if (!file.begins_with(library_to_use) || file.ends_with(String("/empty"))) {
+				ret = unzGoToNextFile(src_pkg_zip);
+				continue; //ignore!
+			}
+			found_library = true;
+#if defined(OSX_ENABLED) || defined(X11_ENABLED)
+			is_execute = true;
+#endif
+			file = file.replace(library_to_use, binary_name + ".xcframework");
+		}
+
+		if (file == project_file) {
+			project_file_data = data;
+		}
+
+		///@TODO need to parse logo files
+
+		if (data.size() > 0) {
+			file = file.replace("godot_ios", binary_name);
+
+			print_line("ADDING: " + file + " size: " + itos(data.size()));
+			total_size += data.size();
+
+			/* write it into our folder structure */
+			file = dest_dir + file;
+
+			/* make sure this folder exists */
+			String dir_name = file.get_base_dir();
+			if (!tmp_app_path->dir_exists(dir_name)) {
+				print_line("Creating " + dir_name);
+				Error dir_err = tmp_app_path->make_dir_recursive(dir_name);
+				if (dir_err) {
+					ERR_PRINT("Can't create '" + dir_name + "'.");
+					unzClose(src_pkg_zip);
+					memdelete(tmp_app_path);
+					return ERR_CANT_CREATE;
+				}
+			}
+
+			/* write the file */
+			FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
+			if (!f) {
+				ERR_PRINT("Can't write '" + file + "'.");
+				unzClose(src_pkg_zip);
+				memdelete(tmp_app_path);
+				return ERR_CANT_CREATE;
+			};
+			f->store_buffer(data.ptr(), data.size());
+			f->close();
+			memdelete(f);
+
+#if defined(OSX_ENABLED) || defined(X11_ENABLED)
+			if (is_execute) {
+				// we need execute rights on this file
+				chmod(file.utf8().get_data(), 0755);
+			}
+#endif
+		}
+
+		ret = unzGoToNextFile(src_pkg_zip);
+	}
+
+	/* we're done with our source zip */
+	unzClose(src_pkg_zip);
+
+	if (!found_library) {
+		ERR_PRINT("Requested template library '" + library_to_use + "' not found. It might be missing from your template archive.");
+		memdelete(tmp_app_path);
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	// Copy project static libs to the project
+	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
+	for (int i = 0; i < export_plugins.size(); i++) {
+		Vector<String> project_static_libs = export_plugins[i]->get_ios_project_static_libs();
+		for (int j = 0; j < project_static_libs.size(); j++) {
+			const String &static_lib_path = project_static_libs[j];
+			String dest_lib_file_path = dest_dir + static_lib_path.get_file();
+			Error lib_copy_err = tmp_app_path->copy(static_lib_path, dest_lib_file_path);
+			if (lib_copy_err != OK) {
+				ERR_PRINT("Can't copy '" + static_lib_path + "'.");
+				memdelete(tmp_app_path);
+				return lib_copy_err;
+			}
+		}
+	}
+
+	String iconset_dir = dest_dir + binary_name + "/Images.xcassets/AppIcon.appiconset/";
+	err = OK;
+	if (!tmp_app_path->dir_exists(iconset_dir)) {
+		err = tmp_app_path->make_dir_recursive(iconset_dir);
+	}
+	memdelete(tmp_app_path);
+	if (err) {
+		return err;
+	}
+
+	err = _export_icons(p_preset, iconset_dir);
+	if (err) {
+		return err;
+	}
+
+	bool use_storyboard = p_preset->get("storyboard/use_launch_screen_storyboard");
+
+	String launch_image_path = dest_dir + binary_name + "/Images.xcassets/LaunchImage.launchimage/";
+	String splash_image_path = dest_dir + binary_name + "/Images.xcassets/SplashImage.imageset/";
+
+	DirAccess *launch_screen_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+
+	if (!launch_screen_da) {
+		return ERR_CANT_CREATE;
+	}
+
+	if (use_storyboard) {
+		print_line("Using Launch Storyboard");
+
+		if (launch_screen_da->change_dir(launch_image_path) == OK) {
+			launch_screen_da->erase_contents_recursive();
+			launch_screen_da->remove(launch_image_path);
+		}
+
+		err = _export_loading_screen_file(p_preset, splash_image_path);
+	} else {
+		print_line("Using Launch Images");
+
+		const String launch_screen_path = dest_dir + binary_name + "/Launch Screen.storyboard";
+
+		launch_screen_da->remove(launch_screen_path);
+
+		if (launch_screen_da->change_dir(splash_image_path) == OK) {
+			launch_screen_da->erase_contents_recursive();
+			launch_screen_da->remove(splash_image_path);
+		}
+
+		err = _export_loading_screen_images(p_preset, launch_image_path);
+	}
+
+	memdelete(launch_screen_da);
+
+	if (err) {
+		return err;
+	}
+
+	print_line("Exporting additional assets");
+	_export_additional_assets(dest_dir + binary_name, libraries, assets);
+	_add_assets_to_project(p_preset, project_file_data, assets);
+	String project_file_name = dest_dir + binary_name + ".xcodeproj/project.pbxproj";
+	FileAccess *f = FileAccess::open(project_file_name, FileAccess::WRITE);
+	if (!f) {
+		ERR_PRINT("Can't write '" + project_file_name + "'.");
+		return ERR_CANT_CREATE;
+	};
+	f->store_buffer(project_file_data.ptr(), project_file_data.size());
+	f->close();
+	memdelete(f);
+
+#ifdef OSX_ENABLED
+	if (ep.step("Code-signing dylibs", 2)) {
+		return ERR_SKIP;
+	}
+	DirAccess *dylibs_dir = DirAccess::open(dest_dir + binary_name + "/dylibs");
+	ERR_FAIL_COND_V(!dylibs_dir, ERR_CANT_OPEN);
+	CodesignData codesign_data(p_preset, p_debug);
+	err = _walk_dir_recursive(dylibs_dir, _codesign, &codesign_data);
+	memdelete(dylibs_dir);
+	ERR_FAIL_COND_V(err, err);
+
+	if (ep.step("Making .xcarchive", 3)) {
+		return ERR_SKIP;
+	}
+	String archive_path = p_path.get_basename() + ".xcarchive";
+	List<String> archive_args;
+	archive_args.push_back("-project");
+	archive_args.push_back(dest_dir + binary_name + ".xcodeproj");
+	archive_args.push_back("-scheme");
+	archive_args.push_back(binary_name);
+	archive_args.push_back("-sdk");
+	archive_args.push_back("iphoneos");
+	archive_args.push_back("-configuration");
+	archive_args.push_back(p_debug ? "Debug" : "Release");
+	archive_args.push_back("-destination");
+	archive_args.push_back("generic/platform=iOS");
+	archive_args.push_back("archive");
+	archive_args.push_back("-archivePath");
+	archive_args.push_back(archive_path);
+	err = OS::get_singleton()->execute("xcodebuild", archive_args);
+	ERR_FAIL_COND_V(err, err);
+
+	if (ep.step("Making .ipa", 4)) {
+		return ERR_SKIP;
+	}
+	List<String> export_args;
+	export_args.push_back("-exportArchive");
+	export_args.push_back("-archivePath");
+	export_args.push_back(archive_path);
+	export_args.push_back("-exportOptionsPlist");
+	export_args.push_back(dest_dir + binary_name + "/export_options.plist");
+	export_args.push_back("-allowProvisioningUpdates");
+	export_args.push_back("-exportPath");
+	export_args.push_back(dest_dir);
+	err = OS::get_singleton()->execute("xcodebuild", export_args);
+	ERR_FAIL_COND_V(err, err);
+#else
+	print_line(".ipa can only be built on macOS. Leaving Xcode project without building the package.");
+#endif
+
+	return OK;
+}
+
+bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+	String err;
+	bool valid = false;
+
+	// Look for export templates (first official, and if defined custom templates).
+
+	bool dvalid = exists_export_template("iphone.zip", &err);
+	bool rvalid = dvalid; // Both in the same ZIP.
+
+	if (p_preset->get("custom_template/debug") != "") {
+		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
+		if (!dvalid) {
+			err += TTR("Custom debug template not found.") + "\n";
+		}
+	}
+	if (p_preset->get("custom_template/release") != "") {
+		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
+		if (!rvalid) {
+			err += TTR("Custom release template not found.") + "\n";
+		}
+	}
+
+	valid = dvalid || rvalid;
+	r_missing_templates = !valid;
+
+	// Validate the rest of the configuration.
+
+	String team_id = p_preset->get("application/app_store_team_id");
+	if (team_id.length() == 0) {
+		err += TTR("App Store Team ID not specified - cannot configure the project.") + "\n";
+		valid = false;
+	}
+
+	String identifier = p_preset->get("application/bundle_identifier");
+	String pn_err;
+	if (!is_package_name_valid(identifier, &pn_err)) {
+		err += TTR("Invalid Identifier:") + " " + pn_err + "\n";
+		valid = false;
+	}
+
+	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
+		IconInfo info = icon_infos[i];
+		String icon_path = p_preset->get(info.preset_key);
+		if (icon_path.length() == 0) {
+			if (info.is_required) {
+				err += TTR("Required icon is not specified in the preset.") + "\n";
+				valid = false;
+			}
+			break;
+		}
+	}
+
+	String etc_error = test_etc2_or_pvrtc();
+	if (etc_error != String()) {
+		valid = false;
+		err += etc_error;
+	}
+
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+EditorExportPlatformIOS::EditorExportPlatformIOS() {
+	Ref<Image> img = memnew(Image(_iphone_logo));
+	logo.instantiate();
+	logo->create_from_image(img);
+
+	plugins_changed.set();
+
+	check_for_changes_thread.start(_check_for_changes_poll_thread, this);
+}
+
+EditorExportPlatformIOS::~EditorExportPlatformIOS() {
+	quit_request.set();
+	check_for_changes_thread.wait_to_finish();
+}
diff --git a/platform/iphone/export/export_plugin.h b/platform/iphone/export/export_plugin.h
new file mode 100644
index 0000000000..8d3af6e057
--- /dev/null
+++ b/platform/iphone/export/export_plugin.h
@@ -0,0 +1,296 @@
+/*************************************************************************/
+/*  export_plugin.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef IPHONE_EXPORT_PLUGIN_H
+#define IPHONE_EXPORT_PLUGIN_H
+
+#include "core/config/project_settings.h"
+#include "core/io/file_access.h"
+#include "core/io/image_loader.h"
+#include "core/io/marshalls.h"
+#include "core/io/resource_saver.h"
+#include "core/io/zip_io.h"
+#include "core/os/os.h"
+#include "core/templates/safe_refcount.h"
+#include "core/version.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "main/splash.gen.h"
+#include "platform/iphone/logo.gen.h"
+#include "string.h"
+
+#include "godot_plugin_config.h"
+
+#include <sys/stat.h>
+
+class EditorExportPlatformIOS : public EditorExportPlatform {
+	GDCLASS(EditorExportPlatformIOS, EditorExportPlatform);
+
+	int version_code;
+
+	Ref<ImageTexture> logo;
+
+	// Plugins
+	SafeFlag plugins_changed;
+	Thread check_for_changes_thread;
+	SafeFlag quit_request;
+	Mutex plugins_lock;
+	Vector<PluginConfigIOS> plugins;
+
+	typedef Error (*FileHandler)(String p_file, void *p_userdata);
+	static Error _walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata);
+	static Error _codesign(String p_file, void *p_userdata);
+	void _blend_and_rotate(Ref<Image> &p_dst, Ref<Image> &p_src, bool p_rot);
+
+	struct IOSConfigData {
+		String pkg_name;
+		String binary_name;
+		String plist_content;
+		String architectures;
+		String linker_flags;
+		String cpp_code;
+		String modules_buildfile;
+		String modules_fileref;
+		String modules_buildphase;
+		String modules_buildgrp;
+		Vector<String> capabilities;
+	};
+	struct ExportArchitecture {
+		String name;
+		bool is_default = false;
+
+		ExportArchitecture() {}
+
+		ExportArchitecture(String p_name, bool p_is_default) {
+			name = p_name;
+			is_default = p_is_default;
+		}
+	};
+
+	struct IOSExportAsset {
+		String exported_path;
+		bool is_framework = false; // framework is anything linked to the binary, otherwise it's a resource
+		bool should_embed = false;
+	};
+
+	String _get_additional_plist_content();
+	String _get_linker_flags();
+	String _get_cpp_code();
+	void _fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const IOSConfigData &p_config, bool p_debug);
+	Error _export_loading_screen_images(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir);
+	Error _export_loading_screen_file(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir);
+	Error _export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir);
+
+	Vector<ExportArchitecture> _get_supported_architectures();
+	Vector<String> _get_preset_architectures(const Ref<EditorExportPreset> &p_preset);
+
+	void _add_assets_to_project(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_project_data, const Vector<IOSExportAsset> &p_additional_assets);
+	Error _export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets);
+	Error _copy_asset(const String &p_out_dir, const String &p_asset, const String *p_custom_file_name, bool p_is_framework, bool p_should_embed, Vector<IOSExportAsset> &r_exported_assets);
+	Error _export_additional_assets(const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<IOSExportAsset> &r_exported_assets);
+	Error _export_ios_plugins(const Ref<EditorExportPreset> &p_preset, IOSConfigData &p_config_data, const String &dest_dir, Vector<IOSExportAsset> &r_exported_assets, bool p_debug);
+
+	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const {
+		String pname = p_package;
+
+		if (pname.length() == 0) {
+			if (r_error) {
+				*r_error = TTR("Identifier is missing.");
+			}
+			return false;
+		}
+
+		for (int i = 0; i < pname.length(); i++) {
+			char32_t c = pname[i];
+			if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) {
+				if (r_error) {
+					*r_error = vformat(TTR("The character '%s' is not allowed in Identifier."), String::chr(c));
+				}
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	static void _check_for_changes_poll_thread(void *ud) {
+		EditorExportPlatformIOS *ea = (EditorExportPlatformIOS *)ud;
+
+		while (!ea->quit_request.is_set()) {
+			// Nothing to do if we already know the plugins have changed.
+			if (!ea->plugins_changed.is_set()) {
+				MutexLock lock(ea->plugins_lock);
+
+				Vector<PluginConfigIOS> loaded_plugins = get_plugins();
+
+				if (ea->plugins.size() != loaded_plugins.size()) {
+					ea->plugins_changed.set();
+				} else {
+					for (int i = 0; i < ea->plugins.size(); i++) {
+						if (ea->plugins[i].name != loaded_plugins[i].name || ea->plugins[i].last_updated != loaded_plugins[i].last_updated) {
+							ea->plugins_changed.set();
+							break;
+						}
+					}
+				}
+			}
+
+			uint64_t wait = 3000000;
+			uint64_t time = OS::get_singleton()->get_ticks_usec();
+			while (OS::get_singleton()->get_ticks_usec() - time < wait) {
+				OS::get_singleton()->delay_usec(300000);
+
+				if (ea->quit_request.is_set()) {
+					break;
+				}
+			}
+		}
+	}
+
+protected:
+	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
+	virtual void get_export_options(List<ExportOption> *r_options) override;
+
+public:
+	virtual String get_name() const override { return "iOS"; }
+	virtual String get_os_name() const override { return "iOS"; }
+	virtual Ref<Texture2D> get_logo() const override { return logo; }
+
+	virtual bool should_update_export_options() override {
+		bool export_options_changed = plugins_changed.is_set();
+		if (export_options_changed) {
+			// don't clear unless we're reporting true, to avoid race
+			plugins_changed.clear();
+		}
+		return export_options_changed;
+	}
+
+	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override {
+		List<String> list;
+		list.push_back("ipa");
+		return list;
+	}
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
+
+	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+
+	virtual void get_platform_features(List<String> *r_features) override {
+		r_features->push_back("mobile");
+		r_features->push_back("iOS");
+	}
+
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
+	}
+
+	EditorExportPlatformIOS();
+	~EditorExportPlatformIOS();
+
+	/// List the gdip files in the directory specified by the p_path parameter.
+	static Vector<String> list_plugin_config_files(const String &p_path, bool p_check_directories) {
+		Vector<String> dir_files;
+		DirAccessRef da = DirAccess::open(p_path);
+		if (da) {
+			da->list_dir_begin();
+			while (true) {
+				String file = da->get_next();
+				if (file.is_empty()) {
+					break;
+				}
+
+				if (file == "." || file == "..") {
+					continue;
+				}
+
+				if (da->current_is_hidden()) {
+					continue;
+				}
+
+				if (da->current_is_dir()) {
+					if (p_check_directories) {
+						Vector<String> directory_files = list_plugin_config_files(p_path.plus_file(file), false);
+						for (int i = 0; i < directory_files.size(); ++i) {
+							dir_files.push_back(file.plus_file(directory_files[i]));
+						}
+					}
+
+					continue;
+				}
+
+				if (file.ends_with(PluginConfigIOS::PLUGIN_CONFIG_EXT)) {
+					dir_files.push_back(file);
+				}
+			}
+			da->list_dir_end();
+		}
+
+		return dir_files;
+	}
+
+	static Vector<PluginConfigIOS> get_plugins() {
+		Vector<PluginConfigIOS> loaded_plugins;
+
+		String plugins_dir = ProjectSettings::get_singleton()->get_resource_path().plus_file("ios/plugins");
+
+		if (DirAccess::exists(plugins_dir)) {
+			Vector<String> plugins_filenames = list_plugin_config_files(plugins_dir, true);
+
+			if (!plugins_filenames.is_empty()) {
+				Ref<ConfigFile> config_file = memnew(ConfigFile);
+				for (int i = 0; i < plugins_filenames.size(); i++) {
+					PluginConfigIOS config = PluginConfigIOS::load_plugin_config(config_file, plugins_dir.plus_file(plugins_filenames[i]));
+					if (config.valid_config) {
+						loaded_plugins.push_back(config);
+					} else {
+						print_error("Invalid plugin config file " + plugins_filenames[i]);
+					}
+				}
+			}
+		}
+
+		return loaded_plugins;
+	}
+
+	static Vector<PluginConfigIOS> get_enabled_plugins(const Ref<EditorExportPreset> &p_presets) {
+		Vector<PluginConfigIOS> enabled_plugins;
+		Vector<PluginConfigIOS> all_plugins = get_plugins();
+		for (int i = 0; i < all_plugins.size(); i++) {
+			PluginConfigIOS plugin = all_plugins[i];
+			bool enabled = p_presets->get("plugins/" + plugin.name);
+			if (enabled) {
+				enabled_plugins.push_back(plugin);
+			}
+		}
+
+		return enabled_plugins;
+	}
+};
+
+#endif
diff --git a/platform/iphone/plugin/godot_plugin_config.h b/platform/iphone/export/godot_plugin_config.cpp
index f9c5d7e51f..9d0324f41a 100644
--- a/platform/iphone/plugin/godot_plugin_config.h
+++ b/platform/iphone/export/godot_plugin_config.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  godot_plugin_config.h                                                */
+/*  godot_plugin_config.cpp                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,92 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_PLUGIN_CONFIG_H
-#define GODOT_PLUGIN_CONFIG_H
-
-#include "core/error/error_list.h"
-#include "core/io/config_file.h"
-#include "core/string/ustring.h"
-
-/*
- The `config` section and fields are required and defined as follow:
-- **name**: name of the plugin
-- **binary**: path to static `.a` library
-
-The `dependencies` and fields are optional.
-- **linked**: dependencies that should only be linked.
-- **embedded**: dependencies that should be linked and embedded into application.
-- **system**: system dependencies that should be linked.
-- **capabilities**: capabilities that would be used for `UIRequiredDeviceCapabilities` options in Info.plist file.
-- **files**: files that would be copied into application
-
-The `plist` section are optional.
-- **key**: key and value that would be added in Info.plist file.
- */
-
-struct PluginConfigIOS {
-	inline static const char *PLUGIN_CONFIG_EXT = ".gdip";
-
-	inline static const char *CONFIG_SECTION = "config";
-	inline static const char *CONFIG_NAME_KEY = "name";
-	inline static const char *CONFIG_BINARY_KEY = "binary";
-	inline static const char *CONFIG_INITIALIZE_KEY = "initialization";
-	inline static const char *CONFIG_DEINITIALIZE_KEY = "deinitialization";
-
-	inline static const char *DEPENDENCIES_SECTION = "dependencies";
-	inline static const char *DEPENDENCIES_LINKED_KEY = "linked";
-	inline static const char *DEPENDENCIES_EMBEDDED_KEY = "embedded";
-	inline static const char *DEPENDENCIES_SYSTEM_KEY = "system";
-	inline static const char *DEPENDENCIES_CAPABILITIES_KEY = "capabilities";
-	inline static const char *DEPENDENCIES_FILES_KEY = "files";
-	inline static const char *DEPENDENCIES_LINKER_FLAGS = "linker_flags";
-
-	inline static const char *PLIST_SECTION = "plist";
-
-	enum PlistItemType {
-		UNKNOWN,
-		STRING,
-		INTEGER,
-		BOOLEAN,
-		RAW,
-		STRING_INPUT,
-	};
-
-	struct PlistItem {
-		PlistItemType type;
-		String value;
-	};
-
-	// Set to true when the config file is properly loaded.
-	bool valid_config = false;
-	bool supports_targets = false;
-	// Unix timestamp of last change to this plugin.
-	uint64_t last_updated = 0;
-
-	// Required config section
-	String name;
-	String binary;
-	String initialization_method;
-	String deinitialization_method;
-
-	// Optional dependencies section
-	Vector<String> linked_dependencies;
-	Vector<String> embedded_dependencies;
-	Vector<String> system_dependencies;
-
-	Vector<String> files_to_copy;
-	Vector<String> capabilities;
-
-	Vector<String> linker_flags;
-
-	// Optional plist section
-	// String value is default value.
-	// Currently supports `string`, `boolean`, `integer`, `raw`, `string_input` types
-	// <name>:<type> = <value>
-	HashMap<String, PlistItem> plist;
-};
-
-static inline String resolve_local_dependency_path(String plugin_config_dir, String dependency_path) {
+#include "godot_plugin_config.h"
+
+#include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+
+String PluginConfigIOS::resolve_local_dependency_path(String plugin_config_dir, String dependency_path) {
 	String absolute_path;
 
 	if (dependency_path.is_empty()) {
@@ -130,7 +51,7 @@ static inline String resolve_local_dependency_path(String plugin_config_dir, Str
 	return absolute_path.replace(res_path, "res://");
 }
 
-static inline String resolve_system_dependency_path(String dependency_path) {
+String PluginConfigIOS::resolve_system_dependency_path(String dependency_path) {
 	String absolute_path;
 
 	if (dependency_path.is_empty()) {
@@ -146,7 +67,7 @@ static inline String resolve_system_dependency_path(String dependency_path) {
 	return system_path.plus_file(dependency_path);
 }
 
-static inline Vector<String> resolve_local_dependencies(String plugin_config_dir, Vector<String> p_paths) {
+Vector<String> PluginConfigIOS::resolve_local_dependencies(String plugin_config_dir, Vector<String> p_paths) {
 	Vector<String> paths;
 
 	for (int i = 0; i < p_paths.size(); i++) {
@@ -162,7 +83,7 @@ static inline Vector<String> resolve_local_dependencies(String plugin_config_dir
 	return paths;
 }
 
-static inline Vector<String> resolve_system_dependencies(Vector<String> p_paths) {
+Vector<String> PluginConfigIOS::resolve_system_dependencies(Vector<String> p_paths) {
 	Vector<String> paths;
 
 	for (int i = 0; i < p_paths.size(); i++) {
@@ -178,7 +99,7 @@ static inline Vector<String> resolve_system_dependencies(Vector<String> p_paths)
 	return paths;
 }
 
-static inline bool validate_plugin(PluginConfigIOS &plugin_config) {
+bool PluginConfigIOS::validate_plugin(PluginConfigIOS &plugin_config) {
 	bool valid_name = !plugin_config.name.is_empty();
 	bool valid_binary_name = !plugin_config.binary.is_empty();
 	bool valid_initialize = !plugin_config.initialization_method.is_empty();
@@ -213,7 +134,7 @@ static inline bool validate_plugin(PluginConfigIOS &plugin_config) {
 	return plugin_config.valid_config;
 }
 
-static inline String get_plugin_main_binary(PluginConfigIOS &plugin_config, bool p_debug) {
+String PluginConfigIOS::get_plugin_main_binary(PluginConfigIOS &plugin_config, bool p_debug) {
 	if (!plugin_config.supports_targets) {
 		return plugin_config.binary;
 	}
@@ -226,7 +147,7 @@ static inline String get_plugin_main_binary(PluginConfigIOS &plugin_config, bool
 	return plugin_binary_dir.plus_file(plugin_file);
 }
 
-static inline uint64_t get_plugin_modification_time(const PluginConfigIOS &plugin_config, const String &config_path) {
+uint64_t PluginConfigIOS::get_plugin_modification_time(const PluginConfigIOS &plugin_config, const String &config_path) {
 	uint64_t last_updated = FileAccess::get_modified_time(config_path);
 
 	if (!plugin_config.supports_targets) {
@@ -245,7 +166,7 @@ static inline uint64_t get_plugin_modification_time(const PluginConfigIOS &plugi
 	return last_updated;
 }
 
-static inline PluginConfigIOS load_plugin_config(Ref<ConfigFile> config_file, const String &path) {
+PluginConfigIOS PluginConfigIOS::load_plugin_config(Ref<ConfigFile> config_file, const String &path) {
 	PluginConfigIOS plugin_config = {};
 
 	if (!config_file.is_valid()) {
@@ -362,5 +283,3 @@ static inline PluginConfigIOS load_plugin_config(Ref<ConfigFile> config_file, co
 
 	return plugin_config;
 }
-
-#endif // GODOT_PLUGIN_CONFIG_H
diff --git a/platform/iphone/export/godot_plugin_config.h b/platform/iphone/export/godot_plugin_config.h
new file mode 100644
index 0000000000..1add281627
--- /dev/null
+++ b/platform/iphone/export/godot_plugin_config.h
@@ -0,0 +1,132 @@
+/*************************************************************************/
+/*  godot_plugin_config.h                                                */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef IPHONE_GODOT_PLUGIN_CONFIG_H
+#define IPHONE_GODOT_PLUGIN_CONFIG_H
+
+#include "core/error/error_list.h"
+#include "core/io/config_file.h"
+#include "core/string/ustring.h"
+
+/*
+ The `config` section and fields are required and defined as follow:
+- **name**: name of the plugin
+- **binary**: path to static `.a` library
+
+The `dependencies` and fields are optional.
+- **linked**: dependencies that should only be linked.
+- **embedded**: dependencies that should be linked and embedded into application.
+- **system**: system dependencies that should be linked.
+- **capabilities**: capabilities that would be used for `UIRequiredDeviceCapabilities` options in Info.plist file.
+- **files**: files that would be copied into application
+
+The `plist` section are optional.
+- **key**: key and value that would be added in Info.plist file.
+ */
+
+struct PluginConfigIOS {
+	inline static const char *PLUGIN_CONFIG_EXT = ".gdip";
+
+	inline static const char *CONFIG_SECTION = "config";
+	inline static const char *CONFIG_NAME_KEY = "name";
+	inline static const char *CONFIG_BINARY_KEY = "binary";
+	inline static const char *CONFIG_INITIALIZE_KEY = "initialization";
+	inline static const char *CONFIG_DEINITIALIZE_KEY = "deinitialization";
+
+	inline static const char *DEPENDENCIES_SECTION = "dependencies";
+	inline static const char *DEPENDENCIES_LINKED_KEY = "linked";
+	inline static const char *DEPENDENCIES_EMBEDDED_KEY = "embedded";
+	inline static const char *DEPENDENCIES_SYSTEM_KEY = "system";
+	inline static const char *DEPENDENCIES_CAPABILITIES_KEY = "capabilities";
+	inline static const char *DEPENDENCIES_FILES_KEY = "files";
+	inline static const char *DEPENDENCIES_LINKER_FLAGS = "linker_flags";
+
+	inline static const char *PLIST_SECTION = "plist";
+
+	enum PlistItemType {
+		UNKNOWN,
+		STRING,
+		INTEGER,
+		BOOLEAN,
+		RAW,
+		STRING_INPUT,
+	};
+
+	struct PlistItem {
+		PlistItemType type;
+		String value;
+	};
+
+	// Set to true when the config file is properly loaded.
+	bool valid_config = false;
+	bool supports_targets = false;
+	// Unix timestamp of last change to this plugin.
+	uint64_t last_updated = 0;
+
+	// Required config section
+	String name;
+	String binary;
+	String initialization_method;
+	String deinitialization_method;
+
+	// Optional dependencies section
+	Vector<String> linked_dependencies;
+	Vector<String> embedded_dependencies;
+	Vector<String> system_dependencies;
+
+	Vector<String> files_to_copy;
+	Vector<String> capabilities;
+
+	Vector<String> linker_flags;
+
+	// Optional plist section
+	// String value is default value.
+	// Currently supports `string`, `boolean`, `integer`, `raw`, `string_input` types
+	// <name>:<type> = <value>
+	HashMap<String, PlistItem> plist;
+
+	static String resolve_local_dependency_path(String plugin_config_dir, String dependency_path);
+
+	static String resolve_system_dependency_path(String dependency_path);
+
+	static Vector<String> resolve_local_dependencies(String plugin_config_dir, Vector<String> p_paths);
+
+	static Vector<String> resolve_system_dependencies(Vector<String> p_paths);
+
+	static bool validate_plugin(PluginConfigIOS &plugin_config);
+
+	static String get_plugin_main_binary(PluginConfigIOS &plugin_config, bool p_debug);
+
+	static uint64_t get_plugin_modification_time(const PluginConfigIOS &plugin_config, const String &config_path);
+
+	static PluginConfigIOS load_plugin_config(Ref<ConfigFile> config_file, const String &path);
+};
+
+#endif // GODOT_PLUGIN_CONFIG_H
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index bf4244eda4..889b0bbd02 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -28,971 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/io/image_loader.h"
-#include "core/io/stream_peer_ssl.h"
-#include "core/io/tcp_server.h"
-#include "core/io/zip_io.h"
-#include "editor/editor_export.h"
-#include "editor/editor_node.h"
-#include "main/splash.gen.h"
-#include "platform/javascript/logo.gen.h"
-#include "platform/javascript/run_icon.gen.h"
+#include "export.h"
 
-class EditorHTTPServer : public RefCounted {
-private:
-	Ref<TCPServer> server;
-	Map<String, String> mimes;
-	Ref<StreamPeerTCP> tcp;
-	Ref<StreamPeerSSL> ssl;
-	Ref<StreamPeer> peer;
-	Ref<CryptoKey> key;
-	Ref<X509Certificate> cert;
-	bool use_ssl = false;
-	uint64_t time = 0;
-	uint8_t req_buf[4096];
-	int req_pos = 0;
-
-	void _clear_client() {
-		peer = Ref<StreamPeer>();
-		ssl = Ref<StreamPeerSSL>();
-		tcp = Ref<StreamPeerTCP>();
-		memset(req_buf, 0, sizeof(req_buf));
-		time = 0;
-		req_pos = 0;
-	}
-
-	void _set_internal_certs(Ref<Crypto> p_crypto) {
-		const String cache_path = EditorPaths::get_singleton()->get_cache_dir();
-		const String key_path = cache_path.plus_file("html5_server.key");
-		const String crt_path = cache_path.plus_file("html5_server.crt");
-		bool regen = !FileAccess::exists(key_path) || !FileAccess::exists(crt_path);
-		if (!regen) {
-			key = Ref<CryptoKey>(CryptoKey::create());
-			cert = Ref<X509Certificate>(X509Certificate::create());
-			if (key->load(key_path) != OK || cert->load(crt_path) != OK) {
-				regen = true;
-			}
-		}
-		if (regen) {
-			key = p_crypto->generate_rsa(2048);
-			key->save(key_path);
-			cert = p_crypto->generate_self_signed_certificate(key, "CN=godot-debug.local,O=A Game Dev,C=XXA", "20140101000000", "20340101000000");
-			cert->save(crt_path);
-		}
-	}
-
-public:
-	EditorHTTPServer() {
-		mimes["html"] = "text/html";
-		mimes["js"] = "application/javascript";
-		mimes["json"] = "application/json";
-		mimes["pck"] = "application/octet-stream";
-		mimes["png"] = "image/png";
-		mimes["svg"] = "image/svg";
-		mimes["wasm"] = "application/wasm";
-		server.instantiate();
-		stop();
-	}
-
-	void stop() {
-		server->stop();
-		_clear_client();
-	}
-
-	Error listen(int p_port, IPAddress p_address, bool p_use_ssl, String p_ssl_key, String p_ssl_cert) {
-		use_ssl = p_use_ssl;
-		if (use_ssl) {
-			Ref<Crypto> crypto = Crypto::create();
-			if (crypto.is_null()) {
-				return ERR_UNAVAILABLE;
-			}
-			if (!p_ssl_key.is_empty() && !p_ssl_cert.is_empty()) {
-				key = Ref<CryptoKey>(CryptoKey::create());
-				Error err = key->load(p_ssl_key);
-				ERR_FAIL_COND_V(err != OK, err);
-				cert = Ref<X509Certificate>(X509Certificate::create());
-				err = cert->load(p_ssl_cert);
-				ERR_FAIL_COND_V(err != OK, err);
-			} else {
-				_set_internal_certs(crypto);
-			}
-		}
-		return server->listen(p_port, p_address);
-	}
-
-	bool is_listening() const {
-		return server->is_listening();
-	}
-
-	void _send_response() {
-		Vector<String> psa = String((char *)req_buf).split("\r\n");
-		int len = psa.size();
-		ERR_FAIL_COND_MSG(len < 4, "Not enough response headers, got: " + itos(len) + ", expected >= 4.");
-
-		Vector<String> req = psa[0].split(" ", false);
-		ERR_FAIL_COND_MSG(req.size() < 2, "Invalid protocol or status code.");
-
-		// Wrong protocol
-		ERR_FAIL_COND_MSG(req[0] != "GET" || req[2] != "HTTP/1.1", "Invalid method or HTTP version.");
-
-		const int query_index = req[1].find_char('?');
-		const String path = (query_index == -1) ? req[1] : req[1].substr(0, query_index);
-
-		const String req_file = path.get_file();
-		const String req_ext = path.get_extension();
-		const String cache_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("web");
-		const String filepath = cache_path.plus_file(req_file);
-
-		if (!mimes.has(req_ext) || !FileAccess::exists(filepath)) {
-			String s = "HTTP/1.1 404 Not Found\r\n";
-			s += "Connection: Close\r\n";
-			s += "\r\n";
-			CharString cs = s.utf8();
-			peer->put_data((const uint8_t *)cs.get_data(), cs.size() - 1);
-			return;
-		}
-		const String ctype = mimes[req_ext];
-
-		FileAccess *f = FileAccess::open(filepath, FileAccess::READ);
-		ERR_FAIL_COND(!f);
-		String s = "HTTP/1.1 200 OK\r\n";
-		s += "Connection: Close\r\n";
-		s += "Content-Type: " + ctype + "\r\n";
-		s += "Access-Control-Allow-Origin: *\r\n";
-		s += "Cross-Origin-Opener-Policy: same-origin\r\n";
-		s += "Cross-Origin-Embedder-Policy: require-corp\r\n";
-		s += "Cache-Control: no-store, max-age=0\r\n";
-		s += "\r\n";
-		CharString cs = s.utf8();
-		Error err = peer->put_data((const uint8_t *)cs.get_data(), cs.size() - 1);
-		if (err != OK) {
-			memdelete(f);
-			ERR_FAIL();
-		}
-
-		while (true) {
-			uint8_t bytes[4096];
-			uint64_t read = f->get_buffer(bytes, 4096);
-			if (read == 0) {
-				break;
-			}
-			err = peer->put_data(bytes, read);
-			if (err != OK) {
-				memdelete(f);
-				ERR_FAIL();
-			}
-		}
-		memdelete(f);
-	}
-
-	void poll() {
-		if (!server->is_listening()) {
-			return;
-		}
-		if (tcp.is_null()) {
-			if (!server->is_connection_available()) {
-				return;
-			}
-			tcp = server->take_connection();
-			peer = tcp;
-			time = OS::get_singleton()->get_ticks_usec();
-		}
-		if (OS::get_singleton()->get_ticks_usec() - time > 1000000) {
-			_clear_client();
-			return;
-		}
-		if (tcp->get_status() != StreamPeerTCP::STATUS_CONNECTED) {
-			return;
-		}
-
-		if (use_ssl) {
-			if (ssl.is_null()) {
-				ssl = Ref<StreamPeerSSL>(StreamPeerSSL::create());
-				peer = ssl;
-				ssl->set_blocking_handshake_enabled(false);
-				if (ssl->accept_stream(tcp, key, cert) != OK) {
-					_clear_client();
-					return;
-				}
-			}
-			ssl->poll();
-			if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING) {
-				// Still handshaking, keep waiting.
-				return;
-			}
-			if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
-				_clear_client();
-				return;
-			}
-		}
-
-		while (true) {
-			char *r = (char *)req_buf;
-			int l = req_pos - 1;
-			if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
-				_send_response();
-				_clear_client();
-				return;
-			}
-
-			int read = 0;
-			ERR_FAIL_COND(req_pos >= 4096);
-			Error err = peer->get_partial_data(&req_buf[req_pos], 1, read);
-			if (err != OK) {
-				// Got an error
-				_clear_client();
-				return;
-			} else if (read != 1) {
-				// Busy, wait next poll
-				return;
-			}
-			req_pos += read;
-		}
-	}
-};
-
-class EditorExportPlatformJavaScript : public EditorExportPlatform {
-	GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform);
-
-	Ref<ImageTexture> logo;
-	Ref<ImageTexture> run_icon;
-	Ref<ImageTexture> stop_icon;
-	int menu_options = 0;
-
-	Ref<EditorHTTPServer> server;
-	bool server_quit = false;
-	Mutex server_lock;
-	Thread server_thread;
-
-	enum ExportMode {
-		EXPORT_MODE_NORMAL = 0,
-		EXPORT_MODE_THREADS = 1,
-		EXPORT_MODE_GDNATIVE = 2,
-	};
-
-	String _get_template_name(ExportMode p_mode, bool p_debug) const {
-		String name = "webassembly";
-		switch (p_mode) {
-			case EXPORT_MODE_THREADS:
-				name += "_threads";
-				break;
-			case EXPORT_MODE_GDNATIVE:
-				name += "_gdnative";
-				break;
-			default:
-				break;
-		}
-		if (p_debug) {
-			name += "_debug.zip";
-		} else {
-			name += "_release.zip";
-		}
-		return name;
-	}
-
-	Ref<Image> _get_project_icon() const {
-		Ref<Image> icon;
-		icon.instantiate();
-		const String icon_path = String(GLOBAL_GET("application/config/icon")).strip_edges();
-		if (icon_path.is_empty() || ImageLoader::load_image(icon_path, icon) != OK) {
-			return EditorNode::get_singleton()->get_editor_theme()->get_icon("DefaultProjectIcon", "EditorIcons")->get_image();
-		}
-		return icon;
-	}
-
-	Ref<Image> _get_project_splash() const {
-		Ref<Image> splash;
-		splash.instantiate();
-		const String splash_path = String(GLOBAL_GET("application/boot_splash/image")).strip_edges();
-		if (splash_path.is_empty() || ImageLoader::load_image(splash_path, splash) != OK) {
-			return Ref<Image>(memnew(Image(boot_splash_png)));
-		}
-		return splash;
-	}
-
-	Error _extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa);
-	void _replace_strings(Map<String, String> p_replaces, Vector<uint8_t> &r_template);
-	void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, int p_flags, const Vector<SharedObject> p_shared_objects, const Dictionary &p_file_sizes);
-	Error _add_manifest_icon(const String &p_path, const String &p_icon, int p_size, Array &r_arr);
-	Error _build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects);
-	Error _write_or_error(const uint8_t *p_content, int p_len, String p_path);
-
-	static void _server_thread_poll(void *data);
-
-public:
-	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
-
-	virtual void get_export_options(List<ExportOption> *r_options) override;
-
-	virtual String get_name() const override;
-	virtual String get_os_name() const override;
-	virtual Ref<Texture2D> get_logo() const override;
-
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
-	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
-
-	virtual bool poll_export() override;
-	virtual int get_options_count() const override;
-	virtual String get_option_label(int p_index) const override { return p_index ? TTR("Stop HTTP Server") : TTR("Run in Browser"); }
-	virtual String get_option_tooltip(int p_index) const override { return p_index ? TTR("Stop HTTP Server") : TTR("Run exported HTML in the system's default browser."); }
-	virtual Ref<ImageTexture> get_option_icon(int p_index) const override;
-	virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_option, int p_debug_flags) override;
-	virtual Ref<Texture2D> get_run_icon() const override;
-
-	virtual void get_platform_features(List<String> *r_features) override {
-		r_features->push_back("web");
-		r_features->push_back(get_os_name());
-	}
-
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
-	}
-
-	String get_debug_protocol() const override { return "ws://"; }
-
-	EditorExportPlatformJavaScript();
-	~EditorExportPlatformJavaScript();
-};
-
-Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) {
-	FileAccess *src_f = nullptr;
-	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
-	unzFile pkg = unzOpen2(p_template.utf8().get_data(), &io);
-
-	if (!pkg) {
-		EditorNode::get_singleton()->show_warning(TTR("Could not open template for export:") + "\n" + p_template);
-		return ERR_FILE_NOT_FOUND;
-	}
-
-	if (unzGoToFirstFile(pkg) != UNZ_OK) {
-		EditorNode::get_singleton()->show_warning(TTR("Invalid export template:") + "\n" + p_template);
-		unzClose(pkg);
-		return ERR_FILE_CORRUPT;
-	}
-
-	do {
-		//get filename
-		unz_file_info info;
-		char fname[16384];
-		unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
-
-		String file = fname;
-
-		// Skip service worker and offline page if not exporting pwa.
-		if (!pwa && (file == "godot.service.worker.js" || file == "godot.offline.html")) {
-			continue;
-		}
-		Vector<uint8_t> data;
-		data.resize(info.uncompressed_size);
-
-		//read
-		unzOpenCurrentFile(pkg);
-		unzReadCurrentFile(pkg, data.ptrw(), data.size());
-		unzCloseCurrentFile(pkg);
-
-		//write
-		String dst = p_dir.plus_file(file.replace("godot", p_name));
-		FileAccess *f = FileAccess::open(dst, FileAccess::WRITE);
-		if (!f) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + dst);
-			unzClose(pkg);
-			return ERR_FILE_CANT_WRITE;
-		}
-		f->store_buffer(data.ptr(), data.size());
-		memdelete(f);
-
-	} while (unzGoToNextFile(pkg) == UNZ_OK);
-	unzClose(pkg);
-	return OK;
-}
-
-Error EditorExportPlatformJavaScript::_write_or_error(const uint8_t *p_content, int p_size, String p_path) {
-	FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE);
-	if (!f) {
-		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + p_path);
-		return ERR_FILE_CANT_WRITE;
-	}
-	f->store_buffer(p_content, p_size);
-	memdelete(f);
-	return OK;
-}
-
-void EditorExportPlatformJavaScript::_replace_strings(Map<String, String> p_replaces, Vector<uint8_t> &r_template) {
-	String str_template = String::utf8(reinterpret_cast<const char *>(r_template.ptr()), r_template.size());
-	String out;
-	Vector<String> lines = str_template.split("\n");
-	for (int i = 0; i < lines.size(); i++) {
-		String current_line = lines[i];
-		for (Map<String, String>::Element *E = p_replaces.front(); E; E = E->next()) {
-			current_line = current_line.replace(E->key(), E->get());
-		}
-		out += current_line + "\n";
-	}
-	CharString cs = out.utf8();
-	r_template.resize(cs.length());
-	for (int i = 0; i < cs.length(); i++) {
-		r_template.write[i] = cs[i];
-	}
-}
-
-void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, int p_flags, const Vector<SharedObject> p_shared_objects, const Dictionary &p_file_sizes) {
-	// Engine.js config
-	Dictionary config;
-	Array libs;
-	for (int i = 0; i < p_shared_objects.size(); i++) {
-		libs.push_back(p_shared_objects[i].path.get_file());
-	}
-	Vector<String> flags;
-	gen_export_flags(flags, p_flags & (~DEBUG_FLAG_DUMB_CLIENT));
-	Array args;
-	for (int i = 0; i < flags.size(); i++) {
-		args.push_back(flags[i]);
-	}
-	config["canvasResizePolicy"] = p_preset->get("html/canvas_resize_policy");
-	config["experimentalVK"] = p_preset->get("html/experimental_virtual_keyboard");
-	config["focusCanvas"] = p_preset->get("html/focus_canvas_on_start");
-	config["gdnativeLibs"] = libs;
-	config["executable"] = p_name;
-	config["args"] = args;
-	config["fileSizes"] = p_file_sizes;
-
-	String head_include;
-	if (p_preset->get("html/export_icon")) {
-		head_include += "<link id='-gd-engine-icon' rel='icon' type='image/png' href='" + p_name + ".icon.png' />\n";
-		head_include += "<link rel='apple-touch-icon' href='" + p_name + ".apple-touch-icon.png'/>\n";
-	}
-	if (p_preset->get("progressive_web_app/enabled")) {
-		head_include += "<link rel='manifest' href='" + p_name + ".manifest.json'>\n";
-		head_include += "<script type='application/javascript'>window.addEventListener('load', () => {if ('serviceWorker' in navigator) {navigator.serviceWorker.register('" +
-						p_name + ".service.worker.js');}});</script>\n";
-	}
-
-	// Replaces HTML string
-	const String str_config = Variant(config).to_json_string();
-	const String custom_head_include = p_preset->get("html/head_include");
-	Map<String, String> replaces;
-	replaces["$GODOT_URL"] = p_name + ".js";
-	replaces["$GODOT_PROJECT_NAME"] = ProjectSettings::get_singleton()->get_setting("application/config/name");
-	replaces["$GODOT_HEAD_INCLUDE"] = head_include + custom_head_include;
-	replaces["$GODOT_CONFIG"] = str_config;
-	_replace_strings(replaces, p_html);
-}
-
-Error EditorExportPlatformJavaScript::_add_manifest_icon(const String &p_path, const String &p_icon, int p_size, Array &r_arr) {
-	const String name = p_path.get_file().get_basename();
-	const String icon_name = vformat("%s.%dx%d.png", name, p_size, p_size);
-	const String icon_dest = p_path.get_base_dir().plus_file(icon_name);
-
-	Ref<Image> icon;
-	if (!p_icon.is_empty()) {
-		icon.instantiate();
-		const Error err = ImageLoader::load_image(p_icon, icon);
-		if (err != OK) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not read file:") + "\n" + p_icon);
-			return err;
-		}
-		if (icon->get_width() != p_size || icon->get_height() != p_size) {
-			icon->resize(p_size, p_size);
-		}
-	} else {
-		icon = _get_project_icon();
-		icon->resize(p_size, p_size);
-	}
-	const Error err = icon->save_png(icon_dest);
-	if (err != OK) {
-		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + icon_dest);
-		return err;
-	}
-	Dictionary icon_dict;
-	icon_dict["sizes"] = vformat("%dx%d", p_size, p_size);
-	icon_dict["type"] = "image/png";
-	icon_dict["src"] = icon_name;
-	r_arr.push_back(icon_dict);
-	return err;
-}
-
-Error EditorExportPlatformJavaScript::_build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects) {
-	// Service worker
-	const String dir = p_path.get_base_dir();
-	const String name = p_path.get_file().get_basename();
-	const ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
-	Map<String, String> replaces;
-	replaces["@GODOT_VERSION@"] = "1";
-	replaces["@GODOT_NAME@"] = name;
-	replaces["@GODOT_OFFLINE_PAGE@"] = name + ".offline.html";
-	Array files;
-	replaces["@GODOT_OPT_CACHE@"] = Variant(files).to_json_string();
-	files.push_back(name + ".html");
-	files.push_back(name + ".js");
-	files.push_back(name + ".wasm");
-	files.push_back(name + ".pck");
-	files.push_back(name + ".offline.html");
-	if (p_preset->get("html/export_icon")) {
-		files.push_back(name + ".icon.png");
-		files.push_back(name + ".apple-touch-icon.png");
-	}
-	if (mode == EXPORT_MODE_THREADS) {
-		files.push_back(name + ".worker.js");
-		files.push_back(name + ".audio.worklet.js");
-	} else if (mode == EXPORT_MODE_GDNATIVE) {
-		files.push_back(name + ".side.wasm");
-		for (int i = 0; i < p_shared_objects.size(); i++) {
-			files.push_back(p_shared_objects[i].path.get_file());
-		}
-	}
-	replaces["@GODOT_CACHE@"] = Variant(files).to_json_string();
-
-	const String sw_path = dir.plus_file(name + ".service.worker.js");
-	Vector<uint8_t> sw;
-	{
-		FileAccess *f = FileAccess::open(sw_path, FileAccess::READ);
-		if (!f) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not read file:") + "\n" + sw_path);
-			return ERR_FILE_CANT_READ;
-		}
-		sw.resize(f->get_length());
-		f->get_buffer(sw.ptrw(), sw.size());
-		memdelete(f);
-		f = nullptr;
-	}
-	_replace_strings(replaces, sw);
-	Error err = _write_or_error(sw.ptr(), sw.size(), dir.plus_file(name + ".service.worker.js"));
-	if (err != OK) {
-		return err;
-	}
-
-	// Custom offline page
-	const String offline_page = p_preset->get("progressive_web_app/offline_page");
-	if (!offline_page.is_empty()) {
-		DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-		const String offline_dest = dir.plus_file(name + ".offline.html");
-		err = da->copy(ProjectSettings::get_singleton()->globalize_path(offline_page), offline_dest);
-		if (err != OK) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not read file:") + "\n" + offline_dest);
-			return err;
-		}
-	}
-
-	// Manifest
-	const char *modes[4] = { "fullscreen", "standalone", "minimal-ui", "browser" };
-	const char *orientations[3] = { "any", "landscape", "portrait" };
-	const int display = CLAMP(int(p_preset->get("progressive_web_app/display")), 0, 4);
-	const int orientation = CLAMP(int(p_preset->get("progressive_web_app/orientation")), 0, 3);
-
-	Dictionary manifest;
-	String proj_name = ProjectSettings::get_singleton()->get_setting("application/config/name");
-	if (proj_name.is_empty()) {
-		proj_name = "Godot Game";
-	}
-	manifest["name"] = proj_name;
-	manifest["start_url"] = "./" + name + ".html";
-	manifest["display"] = String::utf8(modes[display]);
-	manifest["orientation"] = String::utf8(orientations[orientation]);
-	manifest["background_color"] = "#" + p_preset->get("progressive_web_app/background_color").operator Color().to_html(false);
-
-	Array icons_arr;
-	const String icon144_path = p_preset->get("progressive_web_app/icon_144x144");
-	err = _add_manifest_icon(p_path, icon144_path, 144, icons_arr);
-	if (err != OK) {
-		return err;
-	}
-	const String icon180_path = p_preset->get("progressive_web_app/icon_180x180");
-	err = _add_manifest_icon(p_path, icon180_path, 180, icons_arr);
-	if (err != OK) {
-		return err;
-	}
-	const String icon512_path = p_preset->get("progressive_web_app/icon_512x512");
-	err = _add_manifest_icon(p_path, icon512_path, 512, icons_arr);
-	if (err != OK) {
-		return err;
-	}
-	manifest["icons"] = icons_arr;
-
-	CharString cs = Variant(manifest).to_json_string().utf8();
-	err = _write_or_error((const uint8_t *)cs.get_data(), cs.length(), dir.plus_file(name + ".manifest.json"));
-	if (err != OK) {
-		return err;
-	}
-
-	return OK;
-}
-
-void EditorExportPlatformJavaScript::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
-	if (p_preset->get("vram_texture_compression/for_desktop")) {
-		r_features->push_back("s3tc");
-	}
-
-	if (p_preset->get("vram_texture_compression/for_mobile")) {
-		String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
-		if (driver == "GLES2") {
-			r_features->push_back("etc");
-		} else if (driver == "Vulkan") {
-			// FIXME: Review if this is correct.
-			r_features->push_back("etc2");
-		}
-	}
-	ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
-	if (mode == EXPORT_MODE_THREADS) {
-		r_features->push_back("threads");
-	} else if (mode == EXPORT_MODE_GDNATIVE) {
-		r_features->push_back("wasm32");
-	}
-}
-
-void EditorExportPlatformJavaScript::get_export_options(List<ExportOption> *r_options) {
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "variant/export_type", PROPERTY_HINT_ENUM, "Regular,Threads,GDNative"), 0)); // Export type.
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "vram_texture_compression/for_desktop"), true)); // S3TC
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "vram_texture_compression/for_mobile"), false)); // ETC or ETC2, depending on renderer
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "html/export_icon"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/custom_html_shell", PROPERTY_HINT_FILE, "*.html"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/head_include", PROPERTY_HINT_MULTILINE_TEXT), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "html/canvas_resize_policy", PROPERTY_HINT_ENUM, "None,Project,Adaptive"), 2));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "html/focus_canvas_on_start"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "html/experimental_virtual_keyboard"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "progressive_web_app/enabled"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/offline_page", PROPERTY_HINT_FILE, "*.html"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "progressive_web_app/display", PROPERTY_HINT_ENUM, "Fullscreen,Standalone,Minimal UI,Browser"), 1));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "progressive_web_app/orientation", PROPERTY_HINT_ENUM, "Any,Landscape,Portrait"), 0));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/icon_144x144", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/icon_180x180", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/icon_512x512", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::COLOR, "progressive_web_app/background_color", PROPERTY_HINT_COLOR_NO_ALPHA), Color()));
-}
-
-String EditorExportPlatformJavaScript::get_name() const {
-	return "HTML5";
-}
-
-String EditorExportPlatformJavaScript::get_os_name() const {
-	return "HTML5";
-}
-
-Ref<Texture2D> EditorExportPlatformJavaScript::get_logo() const {
-	return logo;
-}
-
-bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
-	String err;
-	bool valid = false;
-	ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
-
-	// Look for export templates (first official, and if defined custom templates).
-	bool dvalid = exists_export_template(_get_template_name(mode, true), &err);
-	bool rvalid = exists_export_template(_get_template_name(mode, false), &err);
-
-	if (p_preset->get("custom_template/debug") != "") {
-		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
-		if (!dvalid) {
-			err += TTR("Custom debug template not found.") + "\n";
-		}
-	}
-	if (p_preset->get("custom_template/release") != "") {
-		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
-		if (!rvalid) {
-			err += TTR("Custom release template not found.") + "\n";
-		}
-	}
-
-	valid = dvalid || rvalid;
-	r_missing_templates = !valid;
-
-	// Validate the rest of the configuration.
-
-	if (p_preset->get("vram_texture_compression/for_mobile")) {
-		String etc_error = test_etc2();
-		if (etc_error != String()) {
-			valid = false;
-			err += etc_error;
-		}
-	}
-
-	if (!err.is_empty()) {
-		r_error = err;
-	}
-
-	return valid;
-}
-
-List<String> EditorExportPlatformJavaScript::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {
-	List<String> list;
-	list.push_back("html");
-	return list;
-}
-
-Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
-	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-
-	const String custom_debug = p_preset->get("custom_template/debug");
-	const String custom_release = p_preset->get("custom_template/release");
-	const String custom_html = p_preset->get("html/custom_html_shell");
-	const bool export_icon = p_preset->get("html/export_icon");
-	const bool pwa = p_preset->get("progressive_web_app/enabled");
-
-	const String base_dir = p_path.get_base_dir();
-	const String base_path = p_path.get_basename();
-	const String base_name = p_path.get_file().get_basename();
-
-	// Find the correct template
-	String template_path = p_debug ? custom_debug : custom_release;
-	template_path = template_path.strip_edges();
-	if (template_path == String()) {
-		ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
-		template_path = find_export_template(_get_template_name(mode, p_debug));
-	}
-
-	if (!DirAccess::exists(base_dir)) {
-		return ERR_FILE_BAD_PATH;
-	}
-
-	if (template_path != String() && !FileAccess::exists(template_path)) {
-		EditorNode::get_singleton()->show_warning(TTR("Template file not found:") + "\n" + template_path);
-		return ERR_FILE_NOT_FOUND;
-	}
-
-	// Export pck and shared objects
-	Vector<SharedObject> shared_objects;
-	String pck_path = base_path + ".pck";
-	Error error = save_pack(p_preset, pck_path, &shared_objects);
-	if (error != OK) {
-		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + pck_path);
-		return error;
-	}
-	DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	for (int i = 0; i < shared_objects.size(); i++) {
-		String dst = base_dir.plus_file(shared_objects[i].path.get_file());
-		error = da->copy(shared_objects[i].path, dst);
-		if (error != OK) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + shared_objects[i].path.get_file());
-			memdelete(da);
-			return error;
-		}
-	}
-	memdelete(da);
-	da = nullptr;
-
-	// Extract templates.
-	error = _extract_template(template_path, base_dir, base_name, pwa);
-	if (error) {
-		return error;
-	}
-
-	// Parse generated file sizes (pck and wasm, to help show a meaningful loading bar).
-	Dictionary file_sizes;
-	FileAccess *f = nullptr;
-	f = FileAccess::open(pck_path, FileAccess::READ);
-	if (f) {
-		file_sizes[pck_path.get_file()] = (uint64_t)f->get_length();
-		memdelete(f);
-		f = nullptr;
-	}
-	f = FileAccess::open(base_path + ".wasm", FileAccess::READ);
-	if (f) {
-		file_sizes[base_name + ".wasm"] = (uint64_t)f->get_length();
-		memdelete(f);
-		f = nullptr;
-	}
-
-	// Read the HTML shell file (custom or from template).
-	const String html_path = custom_html.is_empty() ? base_path + ".html" : custom_html;
-	Vector<uint8_t> html;
-	f = FileAccess::open(html_path, FileAccess::READ);
-	if (!f) {
-		EditorNode::get_singleton()->show_warning(TTR("Could not read HTML shell:") + "\n" + html_path);
-		return ERR_FILE_CANT_READ;
-	}
-	html.resize(f->get_length());
-	f->get_buffer(html.ptrw(), html.size());
-	memdelete(f);
-	f = nullptr;
-
-	// Generate HTML file with replaced strings.
-	_fix_html(html, p_preset, base_name, p_debug, p_flags, shared_objects, file_sizes);
-	Error err = _write_or_error(html.ptr(), html.size(), p_path);
-	if (err != OK) {
-		return err;
-	}
-	html.resize(0);
-
-	// Export splash (why?)
-	Ref<Image> splash = _get_project_splash();
-	const String splash_png_path = base_path + ".png";
-	if (splash->save_png(splash_png_path) != OK) {
-		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + splash_png_path);
-		return ERR_FILE_CANT_WRITE;
-	}
-
-	// Save a favicon that can be accessed without waiting for the project to finish loading.
-	// This way, the favicon can be displayed immediately when loading the page.
-	if (export_icon) {
-		Ref<Image> favicon = _get_project_icon();
-		const String favicon_png_path = base_path + ".icon.png";
-		if (favicon->save_png(favicon_png_path) != OK) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + favicon_png_path);
-			return ERR_FILE_CANT_WRITE;
-		}
-		favicon->resize(180, 180);
-		const String apple_icon_png_path = base_path + ".apple-touch-icon.png";
-		if (favicon->save_png(apple_icon_png_path) != OK) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + apple_icon_png_path);
-			return ERR_FILE_CANT_WRITE;
-		}
-	}
-
-	// Generate the PWA worker and manifest
-	if (pwa) {
-		err = _build_pwa(p_preset, p_path, shared_objects);
-		if (err != OK) {
-			return err;
-		}
-	}
-
-	return OK;
-}
-
-bool EditorExportPlatformJavaScript::poll_export() {
-	Ref<EditorExportPreset> preset;
-
-	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
-		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
-		if (ep->is_runnable() && ep->get_platform() == this) {
-			preset = ep;
-			break;
-		}
-	}
-
-	int prev = menu_options;
-	menu_options = preset.is_valid();
-	if (server->is_listening()) {
-		if (menu_options == 0) {
-			MutexLock lock(server_lock);
-			server->stop();
-		} else {
-			menu_options += 1;
-		}
-	}
-	return menu_options != prev;
-}
-
-Ref<ImageTexture> EditorExportPlatformJavaScript::get_option_icon(int p_index) const {
-	return p_index == 1 ? stop_icon : EditorExportPlatform::get_option_icon(p_index);
-}
-
-int EditorExportPlatformJavaScript::get_options_count() const {
-	return menu_options;
-}
-
-Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_preset, int p_option, int p_debug_flags) {
-	if (p_option == 1) {
-		MutexLock lock(server_lock);
-		server->stop();
-		return OK;
-	}
-
-	const String dest = EditorPaths::get_singleton()->get_cache_dir().plus_file("web");
-	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	if (!da->dir_exists(dest)) {
-		Error err = da->make_dir_recursive(dest);
-		if (err != OK) {
-			EditorNode::get_singleton()->show_warning(TTR("Could not create HTTP server directory:") + "\n" + dest);
-			return err;
-		}
-	}
-	const String basepath = dest.plus_file("tmp_js_export");
-	Error err = export_project(p_preset, true, basepath + ".html", p_debug_flags);
-	if (err != OK) {
-		// Export generates several files, clean them up on failure.
-		DirAccess::remove_file_or_error(basepath + ".html");
-		DirAccess::remove_file_or_error(basepath + ".offline.html");
-		DirAccess::remove_file_or_error(basepath + ".js");
-		DirAccess::remove_file_or_error(basepath + ".worker.js");
-		DirAccess::remove_file_or_error(basepath + ".audio.worklet.js");
-		DirAccess::remove_file_or_error(basepath + ".service.worker.js");
-		DirAccess::remove_file_or_error(basepath + ".pck");
-		DirAccess::remove_file_or_error(basepath + ".png");
-		DirAccess::remove_file_or_error(basepath + ".side.wasm");
-		DirAccess::remove_file_or_error(basepath + ".wasm");
-		DirAccess::remove_file_or_error(basepath + ".icon.png");
-		DirAccess::remove_file_or_error(basepath + ".apple-touch-icon.png");
-		return err;
-	}
-
-	const uint16_t bind_port = EDITOR_GET("export/web/http_port");
-	// Resolve host if needed.
-	const String bind_host = EDITOR_GET("export/web/http_host");
-	IPAddress bind_ip;
-	if (bind_host.is_valid_ip_address()) {
-		bind_ip = bind_host;
-	} else {
-		bind_ip = IP::get_singleton()->resolve_hostname(bind_host);
-	}
-	ERR_FAIL_COND_V_MSG(!bind_ip.is_valid(), ERR_INVALID_PARAMETER, "Invalid editor setting 'export/web/http_host': '" + bind_host + "'. Try using '127.0.0.1'.");
-
-	const bool use_ssl = EDITOR_GET("export/web/use_ssl");
-	const String ssl_key = EDITOR_GET("export/web/ssl_key");
-	const String ssl_cert = EDITOR_GET("export/web/ssl_certificate");
-
-	// Restart server.
-	{
-		MutexLock lock(server_lock);
-
-		server->stop();
-		err = server->listen(bind_port, bind_ip, use_ssl, ssl_key, ssl_cert);
-	}
-	if (err != OK) {
-		EditorNode::get_singleton()->show_warning(TTR("Error starting HTTP server:") + "\n" + itos(err));
-		return err;
-	}
-
-	OS::get_singleton()->shell_open(String((use_ssl ? "https://" : "http://") + bind_host + ":" + itos(bind_port) + "/tmp_js_export.html"));
-	// FIXME: Find out how to clean up export files after running the successfully
-	// exported game. Might not be trivial.
-	return OK;
-}
-
-Ref<Texture2D> EditorExportPlatformJavaScript::get_run_icon() const {
-	return run_icon;
-}
-
-void EditorExportPlatformJavaScript::_server_thread_poll(void *data) {
-	EditorExportPlatformJavaScript *ej = (EditorExportPlatformJavaScript *)data;
-	while (!ej->server_quit) {
-		OS::get_singleton()->delay_usec(1000);
-		{
-			MutexLock lock(ej->server_lock);
-			ej->server->poll();
-		}
-	}
-}
-
-EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
-	server.instantiate();
-	server_thread.start(_server_thread_poll, this);
-
-	Ref<Image> img = memnew(Image(_javascript_logo));
-	logo.instantiate();
-	logo->create_from_image(img);
-
-	img = Ref<Image>(memnew(Image(_javascript_run_icon)));
-	run_icon.instantiate();
-	run_icon->create_from_image(img);
-
-	Ref<Theme> theme = EditorNode::get_singleton()->get_editor_theme();
-	if (theme.is_valid()) {
-		stop_icon = theme->get_icon("Stop", "EditorIcons");
-	} else {
-		stop_icon.instantiate();
-	}
-}
-
-EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() {
-	server->stop();
-	server_quit = true;
-	server_thread.wait_to_finish();
-}
+#include "export_plugin.h"
 
 void register_javascript_exporter() {
 	EDITOR_DEF("export/web/http_host", "localhost");
diff --git a/platform/javascript/export/export.h b/platform/javascript/export/export.h
index e641339f55..8e8161b547 100644
--- a/platform/javascript/export/export.h
+++ b/platform/javascript/export/export.h
@@ -28,4 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef JAVASCRIPT_EXPORT_H
+#define JAVASCRIPT_EXPORT_H
+
 void register_javascript_exporter();
+
+#endif
diff --git a/platform/javascript/export/export_plugin.cpp b/platform/javascript/export/export_plugin.cpp
new file mode 100644
index 0000000000..5d285a6e60
--- /dev/null
+++ b/platform/javascript/export/export_plugin.cpp
@@ -0,0 +1,671 @@
+/*************************************************************************/
+/*  export_plugin.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "export_plugin.h"
+
+Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) {
+	FileAccess *src_f = nullptr;
+	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
+	unzFile pkg = unzOpen2(p_template.utf8().get_data(), &io);
+
+	if (!pkg) {
+		EditorNode::get_singleton()->show_warning(TTR("Could not open template for export:") + "\n" + p_template);
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	if (unzGoToFirstFile(pkg) != UNZ_OK) {
+		EditorNode::get_singleton()->show_warning(TTR("Invalid export template:") + "\n" + p_template);
+		unzClose(pkg);
+		return ERR_FILE_CORRUPT;
+	}
+
+	do {
+		//get filename
+		unz_file_info info;
+		char fname[16384];
+		unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
+
+		String file = fname;
+
+		// Skip service worker and offline page if not exporting pwa.
+		if (!pwa && (file == "godot.service.worker.js" || file == "godot.offline.html")) {
+			continue;
+		}
+		Vector<uint8_t> data;
+		data.resize(info.uncompressed_size);
+
+		//read
+		unzOpenCurrentFile(pkg);
+		unzReadCurrentFile(pkg, data.ptrw(), data.size());
+		unzCloseCurrentFile(pkg);
+
+		//write
+		String dst = p_dir.plus_file(file.replace("godot", p_name));
+		FileAccess *f = FileAccess::open(dst, FileAccess::WRITE);
+		if (!f) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + dst);
+			unzClose(pkg);
+			return ERR_FILE_CANT_WRITE;
+		}
+		f->store_buffer(data.ptr(), data.size());
+		memdelete(f);
+
+	} while (unzGoToNextFile(pkg) == UNZ_OK);
+	unzClose(pkg);
+	return OK;
+}
+
+Error EditorExportPlatformJavaScript::_write_or_error(const uint8_t *p_content, int p_size, String p_path) {
+	FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE);
+	if (!f) {
+		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + p_path);
+		return ERR_FILE_CANT_WRITE;
+	}
+	f->store_buffer(p_content, p_size);
+	memdelete(f);
+	return OK;
+}
+
+void EditorExportPlatformJavaScript::_replace_strings(Map<String, String> p_replaces, Vector<uint8_t> &r_template) {
+	String str_template = String::utf8(reinterpret_cast<const char *>(r_template.ptr()), r_template.size());
+	String out;
+	Vector<String> lines = str_template.split("\n");
+	for (int i = 0; i < lines.size(); i++) {
+		String current_line = lines[i];
+		for (Map<String, String>::Element *E = p_replaces.front(); E; E = E->next()) {
+			current_line = current_line.replace(E->key(), E->get());
+		}
+		out += current_line + "\n";
+	}
+	CharString cs = out.utf8();
+	r_template.resize(cs.length());
+	for (int i = 0; i < cs.length(); i++) {
+		r_template.write[i] = cs[i];
+	}
+}
+
+void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, int p_flags, const Vector<SharedObject> p_shared_objects, const Dictionary &p_file_sizes) {
+	// Engine.js config
+	Dictionary config;
+	Array libs;
+	for (int i = 0; i < p_shared_objects.size(); i++) {
+		libs.push_back(p_shared_objects[i].path.get_file());
+	}
+	Vector<String> flags;
+	gen_export_flags(flags, p_flags & (~DEBUG_FLAG_DUMB_CLIENT));
+	Array args;
+	for (int i = 0; i < flags.size(); i++) {
+		args.push_back(flags[i]);
+	}
+	config["canvasResizePolicy"] = p_preset->get("html/canvas_resize_policy");
+	config["experimentalVK"] = p_preset->get("html/experimental_virtual_keyboard");
+	config["focusCanvas"] = p_preset->get("html/focus_canvas_on_start");
+	config["gdnativeLibs"] = libs;
+	config["executable"] = p_name;
+	config["args"] = args;
+	config["fileSizes"] = p_file_sizes;
+
+	String head_include;
+	if (p_preset->get("html/export_icon")) {
+		head_include += "<link id='-gd-engine-icon' rel='icon' type='image/png' href='" + p_name + ".icon.png' />\n";
+		head_include += "<link rel='apple-touch-icon' href='" + p_name + ".apple-touch-icon.png'/>\n";
+	}
+	if (p_preset->get("progressive_web_app/enabled")) {
+		head_include += "<link rel='manifest' href='" + p_name + ".manifest.json'>\n";
+		head_include += "<script type='application/javascript'>window.addEventListener('load', () => {if ('serviceWorker' in navigator) {navigator.serviceWorker.register('" +
+						p_name + ".service.worker.js');}});</script>\n";
+	}
+
+	// Replaces HTML string
+	const String str_config = Variant(config).to_json_string();
+	const String custom_head_include = p_preset->get("html/head_include");
+	Map<String, String> replaces;
+	replaces["$GODOT_URL"] = p_name + ".js";
+	replaces["$GODOT_PROJECT_NAME"] = ProjectSettings::get_singleton()->get_setting("application/config/name");
+	replaces["$GODOT_HEAD_INCLUDE"] = head_include + custom_head_include;
+	replaces["$GODOT_CONFIG"] = str_config;
+	_replace_strings(replaces, p_html);
+}
+
+Error EditorExportPlatformJavaScript::_add_manifest_icon(const String &p_path, const String &p_icon, int p_size, Array &r_arr) {
+	const String name = p_path.get_file().get_basename();
+	const String icon_name = vformat("%s.%dx%d.png", name, p_size, p_size);
+	const String icon_dest = p_path.get_base_dir().plus_file(icon_name);
+
+	Ref<Image> icon;
+	if (!p_icon.is_empty()) {
+		icon.instantiate();
+		const Error err = ImageLoader::load_image(p_icon, icon);
+		if (err != OK) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not read file:") + "\n" + p_icon);
+			return err;
+		}
+		if (icon->get_width() != p_size || icon->get_height() != p_size) {
+			icon->resize(p_size, p_size);
+		}
+	} else {
+		icon = _get_project_icon();
+		icon->resize(p_size, p_size);
+	}
+	const Error err = icon->save_png(icon_dest);
+	if (err != OK) {
+		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + icon_dest);
+		return err;
+	}
+	Dictionary icon_dict;
+	icon_dict["sizes"] = vformat("%dx%d", p_size, p_size);
+	icon_dict["type"] = "image/png";
+	icon_dict["src"] = icon_name;
+	r_arr.push_back(icon_dict);
+	return err;
+}
+
+Error EditorExportPlatformJavaScript::_build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects) {
+	// Service worker
+	const String dir = p_path.get_base_dir();
+	const String name = p_path.get_file().get_basename();
+	const ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
+	Map<String, String> replaces;
+	replaces["@GODOT_VERSION@"] = "1";
+	replaces["@GODOT_NAME@"] = name;
+	replaces["@GODOT_OFFLINE_PAGE@"] = name + ".offline.html";
+	Array files;
+	replaces["@GODOT_OPT_CACHE@"] = Variant(files).to_json_string();
+	files.push_back(name + ".html");
+	files.push_back(name + ".js");
+	files.push_back(name + ".wasm");
+	files.push_back(name + ".pck");
+	files.push_back(name + ".offline.html");
+	if (p_preset->get("html/export_icon")) {
+		files.push_back(name + ".icon.png");
+		files.push_back(name + ".apple-touch-icon.png");
+	}
+	if (mode == EXPORT_MODE_THREADS) {
+		files.push_back(name + ".worker.js");
+		files.push_back(name + ".audio.worklet.js");
+	} else if (mode == EXPORT_MODE_GDNATIVE) {
+		files.push_back(name + ".side.wasm");
+		for (int i = 0; i < p_shared_objects.size(); i++) {
+			files.push_back(p_shared_objects[i].path.get_file());
+		}
+	}
+	replaces["@GODOT_CACHE@"] = Variant(files).to_json_string();
+
+	const String sw_path = dir.plus_file(name + ".service.worker.js");
+	Vector<uint8_t> sw;
+	{
+		FileAccess *f = FileAccess::open(sw_path, FileAccess::READ);
+		if (!f) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not read file:") + "\n" + sw_path);
+			return ERR_FILE_CANT_READ;
+		}
+		sw.resize(f->get_length());
+		f->get_buffer(sw.ptrw(), sw.size());
+		memdelete(f);
+		f = nullptr;
+	}
+	_replace_strings(replaces, sw);
+	Error err = _write_or_error(sw.ptr(), sw.size(), dir.plus_file(name + ".service.worker.js"));
+	if (err != OK) {
+		return err;
+	}
+
+	// Custom offline page
+	const String offline_page = p_preset->get("progressive_web_app/offline_page");
+	if (!offline_page.is_empty()) {
+		DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+		const String offline_dest = dir.plus_file(name + ".offline.html");
+		err = da->copy(ProjectSettings::get_singleton()->globalize_path(offline_page), offline_dest);
+		if (err != OK) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not read file:") + "\n" + offline_dest);
+			return err;
+		}
+	}
+
+	// Manifest
+	const char *modes[4] = { "fullscreen", "standalone", "minimal-ui", "browser" };
+	const char *orientations[3] = { "any", "landscape", "portrait" };
+	const int display = CLAMP(int(p_preset->get("progressive_web_app/display")), 0, 4);
+	const int orientation = CLAMP(int(p_preset->get("progressive_web_app/orientation")), 0, 3);
+
+	Dictionary manifest;
+	String proj_name = ProjectSettings::get_singleton()->get_setting("application/config/name");
+	if (proj_name.is_empty()) {
+		proj_name = "Godot Game";
+	}
+	manifest["name"] = proj_name;
+	manifest["start_url"] = "./" + name + ".html";
+	manifest["display"] = String::utf8(modes[display]);
+	manifest["orientation"] = String::utf8(orientations[orientation]);
+	manifest["background_color"] = "#" + p_preset->get("progressive_web_app/background_color").operator Color().to_html(false);
+
+	Array icons_arr;
+	const String icon144_path = p_preset->get("progressive_web_app/icon_144x144");
+	err = _add_manifest_icon(p_path, icon144_path, 144, icons_arr);
+	if (err != OK) {
+		return err;
+	}
+	const String icon180_path = p_preset->get("progressive_web_app/icon_180x180");
+	err = _add_manifest_icon(p_path, icon180_path, 180, icons_arr);
+	if (err != OK) {
+		return err;
+	}
+	const String icon512_path = p_preset->get("progressive_web_app/icon_512x512");
+	err = _add_manifest_icon(p_path, icon512_path, 512, icons_arr);
+	if (err != OK) {
+		return err;
+	}
+	manifest["icons"] = icons_arr;
+
+	CharString cs = Variant(manifest).to_json_string().utf8();
+	err = _write_or_error((const uint8_t *)cs.get_data(), cs.length(), dir.plus_file(name + ".manifest.json"));
+	if (err != OK) {
+		return err;
+	}
+
+	return OK;
+}
+
+void EditorExportPlatformJavaScript::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
+	if (p_preset->get("vram_texture_compression/for_desktop")) {
+		r_features->push_back("s3tc");
+	}
+
+	if (p_preset->get("vram_texture_compression/for_mobile")) {
+		String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
+		if (driver == "GLES2") {
+			r_features->push_back("etc");
+		} else if (driver == "Vulkan") {
+			// FIXME: Review if this is correct.
+			r_features->push_back("etc2");
+		}
+	}
+	ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
+	if (mode == EXPORT_MODE_THREADS) {
+		r_features->push_back("threads");
+	} else if (mode == EXPORT_MODE_GDNATIVE) {
+		r_features->push_back("wasm32");
+	}
+}
+
+void EditorExportPlatformJavaScript::get_export_options(List<ExportOption> *r_options) {
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "variant/export_type", PROPERTY_HINT_ENUM, "Regular,Threads,GDNative"), 0)); // Export type.
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "vram_texture_compression/for_desktop"), true)); // S3TC
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "vram_texture_compression/for_mobile"), false)); // ETC or ETC2, depending on renderer
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "html/export_icon"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/custom_html_shell", PROPERTY_HINT_FILE, "*.html"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/head_include", PROPERTY_HINT_MULTILINE_TEXT), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "html/canvas_resize_policy", PROPERTY_HINT_ENUM, "None,Project,Adaptive"), 2));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "html/focus_canvas_on_start"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "html/experimental_virtual_keyboard"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "progressive_web_app/enabled"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/offline_page", PROPERTY_HINT_FILE, "*.html"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "progressive_web_app/display", PROPERTY_HINT_ENUM, "Fullscreen,Standalone,Minimal UI,Browser"), 1));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "progressive_web_app/orientation", PROPERTY_HINT_ENUM, "Any,Landscape,Portrait"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/icon_144x144", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/icon_180x180", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "progressive_web_app/icon_512x512", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::COLOR, "progressive_web_app/background_color", PROPERTY_HINT_COLOR_NO_ALPHA), Color()));
+}
+
+String EditorExportPlatformJavaScript::get_name() const {
+	return "HTML5";
+}
+
+String EditorExportPlatformJavaScript::get_os_name() const {
+	return "HTML5";
+}
+
+Ref<Texture2D> EditorExportPlatformJavaScript::get_logo() const {
+	return logo;
+}
+
+bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+	String err;
+	bool valid = false;
+	ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
+
+	// Look for export templates (first official, and if defined custom templates).
+	bool dvalid = exists_export_template(_get_template_name(mode, true), &err);
+	bool rvalid = exists_export_template(_get_template_name(mode, false), &err);
+
+	if (p_preset->get("custom_template/debug") != "") {
+		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
+		if (!dvalid) {
+			err += TTR("Custom debug template not found.") + "\n";
+		}
+	}
+	if (p_preset->get("custom_template/release") != "") {
+		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
+		if (!rvalid) {
+			err += TTR("Custom release template not found.") + "\n";
+		}
+	}
+
+	valid = dvalid || rvalid;
+	r_missing_templates = !valid;
+
+	// Validate the rest of the configuration.
+
+	if (p_preset->get("vram_texture_compression/for_mobile")) {
+		String etc_error = test_etc2();
+		if (etc_error != String()) {
+			valid = false;
+			err += etc_error;
+		}
+	}
+
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+
+	return valid;
+}
+
+List<String> EditorExportPlatformJavaScript::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {
+	List<String> list;
+	list.push_back("html");
+	return list;
+}
+
+Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
+
+	const String custom_debug = p_preset->get("custom_template/debug");
+	const String custom_release = p_preset->get("custom_template/release");
+	const String custom_html = p_preset->get("html/custom_html_shell");
+	const bool export_icon = p_preset->get("html/export_icon");
+	const bool pwa = p_preset->get("progressive_web_app/enabled");
+
+	const String base_dir = p_path.get_base_dir();
+	const String base_path = p_path.get_basename();
+	const String base_name = p_path.get_file().get_basename();
+
+	// Find the correct template
+	String template_path = p_debug ? custom_debug : custom_release;
+	template_path = template_path.strip_edges();
+	if (template_path == String()) {
+		ExportMode mode = (ExportMode)(int)p_preset->get("variant/export_type");
+		template_path = find_export_template(_get_template_name(mode, p_debug));
+	}
+
+	if (!DirAccess::exists(base_dir)) {
+		return ERR_FILE_BAD_PATH;
+	}
+
+	if (template_path != String() && !FileAccess::exists(template_path)) {
+		EditorNode::get_singleton()->show_warning(TTR("Template file not found:") + "\n" + template_path);
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	// Export pck and shared objects
+	Vector<SharedObject> shared_objects;
+	String pck_path = base_path + ".pck";
+	Error error = save_pack(p_preset, pck_path, &shared_objects);
+	if (error != OK) {
+		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + pck_path);
+		return error;
+	}
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	for (int i = 0; i < shared_objects.size(); i++) {
+		String dst = base_dir.plus_file(shared_objects[i].path.get_file());
+		error = da->copy(shared_objects[i].path, dst);
+		if (error != OK) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + shared_objects[i].path.get_file());
+			memdelete(da);
+			return error;
+		}
+	}
+	memdelete(da);
+	da = nullptr;
+
+	// Extract templates.
+	error = _extract_template(template_path, base_dir, base_name, pwa);
+	if (error) {
+		return error;
+	}
+
+	// Parse generated file sizes (pck and wasm, to help show a meaningful loading bar).
+	Dictionary file_sizes;
+	FileAccess *f = nullptr;
+	f = FileAccess::open(pck_path, FileAccess::READ);
+	if (f) {
+		file_sizes[pck_path.get_file()] = (uint64_t)f->get_length();
+		memdelete(f);
+		f = nullptr;
+	}
+	f = FileAccess::open(base_path + ".wasm", FileAccess::READ);
+	if (f) {
+		file_sizes[base_name + ".wasm"] = (uint64_t)f->get_length();
+		memdelete(f);
+		f = nullptr;
+	}
+
+	// Read the HTML shell file (custom or from template).
+	const String html_path = custom_html.is_empty() ? base_path + ".html" : custom_html;
+	Vector<uint8_t> html;
+	f = FileAccess::open(html_path, FileAccess::READ);
+	if (!f) {
+		EditorNode::get_singleton()->show_warning(TTR("Could not read HTML shell:") + "\n" + html_path);
+		return ERR_FILE_CANT_READ;
+	}
+	html.resize(f->get_length());
+	f->get_buffer(html.ptrw(), html.size());
+	memdelete(f);
+	f = nullptr;
+
+	// Generate HTML file with replaced strings.
+	_fix_html(html, p_preset, base_name, p_debug, p_flags, shared_objects, file_sizes);
+	Error err = _write_or_error(html.ptr(), html.size(), p_path);
+	if (err != OK) {
+		return err;
+	}
+	html.resize(0);
+
+	// Export splash (why?)
+	Ref<Image> splash = _get_project_splash();
+	const String splash_png_path = base_path + ".png";
+	if (splash->save_png(splash_png_path) != OK) {
+		EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + splash_png_path);
+		return ERR_FILE_CANT_WRITE;
+	}
+
+	// Save a favicon that can be accessed without waiting for the project to finish loading.
+	// This way, the favicon can be displayed immediately when loading the page.
+	if (export_icon) {
+		Ref<Image> favicon = _get_project_icon();
+		const String favicon_png_path = base_path + ".icon.png";
+		if (favicon->save_png(favicon_png_path) != OK) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + favicon_png_path);
+			return ERR_FILE_CANT_WRITE;
+		}
+		favicon->resize(180, 180);
+		const String apple_icon_png_path = base_path + ".apple-touch-icon.png";
+		if (favicon->save_png(apple_icon_png_path) != OK) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not write file:") + "\n" + apple_icon_png_path);
+			return ERR_FILE_CANT_WRITE;
+		}
+	}
+
+	// Generate the PWA worker and manifest
+	if (pwa) {
+		err = _build_pwa(p_preset, p_path, shared_objects);
+		if (err != OK) {
+			return err;
+		}
+	}
+
+	return OK;
+}
+
+bool EditorExportPlatformJavaScript::poll_export() {
+	Ref<EditorExportPreset> preset;
+
+	for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
+		Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
+		if (ep->is_runnable() && ep->get_platform() == this) {
+			preset = ep;
+			break;
+		}
+	}
+
+	int prev = menu_options;
+	menu_options = preset.is_valid();
+	if (server->is_listening()) {
+		if (menu_options == 0) {
+			MutexLock lock(server_lock);
+			server->stop();
+		} else {
+			menu_options += 1;
+		}
+	}
+	return menu_options != prev;
+}
+
+Ref<ImageTexture> EditorExportPlatformJavaScript::get_option_icon(int p_index) const {
+	return p_index == 1 ? stop_icon : EditorExportPlatform::get_option_icon(p_index);
+}
+
+int EditorExportPlatformJavaScript::get_options_count() const {
+	return menu_options;
+}
+
+Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_preset, int p_option, int p_debug_flags) {
+	if (p_option == 1) {
+		MutexLock lock(server_lock);
+		server->stop();
+		return OK;
+	}
+
+	const String dest = EditorPaths::get_singleton()->get_cache_dir().plus_file("web");
+	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	if (!da->dir_exists(dest)) {
+		Error err = da->make_dir_recursive(dest);
+		if (err != OK) {
+			EditorNode::get_singleton()->show_warning(TTR("Could not create HTTP server directory:") + "\n" + dest);
+			return err;
+		}
+	}
+	const String basepath = dest.plus_file("tmp_js_export");
+	Error err = export_project(p_preset, true, basepath + ".html", p_debug_flags);
+	if (err != OK) {
+		// Export generates several files, clean them up on failure.
+		DirAccess::remove_file_or_error(basepath + ".html");
+		DirAccess::remove_file_or_error(basepath + ".offline.html");
+		DirAccess::remove_file_or_error(basepath + ".js");
+		DirAccess::remove_file_or_error(basepath + ".worker.js");
+		DirAccess::remove_file_or_error(basepath + ".audio.worklet.js");
+		DirAccess::remove_file_or_error(basepath + ".service.worker.js");
+		DirAccess::remove_file_or_error(basepath + ".pck");
+		DirAccess::remove_file_or_error(basepath + ".png");
+		DirAccess::remove_file_or_error(basepath + ".side.wasm");
+		DirAccess::remove_file_or_error(basepath + ".wasm");
+		DirAccess::remove_file_or_error(basepath + ".icon.png");
+		DirAccess::remove_file_or_error(basepath + ".apple-touch-icon.png");
+		return err;
+	}
+
+	const uint16_t bind_port = EDITOR_GET("export/web/http_port");
+	// Resolve host if needed.
+	const String bind_host = EDITOR_GET("export/web/http_host");
+	IPAddress bind_ip;
+	if (bind_host.is_valid_ip_address()) {
+		bind_ip = bind_host;
+	} else {
+		bind_ip = IP::get_singleton()->resolve_hostname(bind_host);
+	}
+	ERR_FAIL_COND_V_MSG(!bind_ip.is_valid(), ERR_INVALID_PARAMETER, "Invalid editor setting 'export/web/http_host': '" + bind_host + "'. Try using '127.0.0.1'.");
+
+	const bool use_ssl = EDITOR_GET("export/web/use_ssl");
+	const String ssl_key = EDITOR_GET("export/web/ssl_key");
+	const String ssl_cert = EDITOR_GET("export/web/ssl_certificate");
+
+	// Restart server.
+	{
+		MutexLock lock(server_lock);
+
+		server->stop();
+		err = server->listen(bind_port, bind_ip, use_ssl, ssl_key, ssl_cert);
+	}
+	if (err != OK) {
+		EditorNode::get_singleton()->show_warning(TTR("Error starting HTTP server:") + "\n" + itos(err));
+		return err;
+	}
+
+	OS::get_singleton()->shell_open(String((use_ssl ? "https://" : "http://") + bind_host + ":" + itos(bind_port) + "/tmp_js_export.html"));
+	// FIXME: Find out how to clean up export files after running the successfully
+	// exported game. Might not be trivial.
+	return OK;
+}
+
+Ref<Texture2D> EditorExportPlatformJavaScript::get_run_icon() const {
+	return run_icon;
+}
+
+void EditorExportPlatformJavaScript::_server_thread_poll(void *data) {
+	EditorExportPlatformJavaScript *ej = (EditorExportPlatformJavaScript *)data;
+	while (!ej->server_quit) {
+		OS::get_singleton()->delay_usec(1000);
+		{
+			MutexLock lock(ej->server_lock);
+			ej->server->poll();
+		}
+	}
+}
+
+EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() {
+	server.instantiate();
+	server_thread.start(_server_thread_poll, this);
+
+	Ref<Image> img = memnew(Image(_javascript_logo));
+	logo.instantiate();
+	logo->create_from_image(img);
+
+	img = Ref<Image>(memnew(Image(_javascript_run_icon)));
+	run_icon.instantiate();
+	run_icon->create_from_image(img);
+
+	Ref<Theme> theme = EditorNode::get_singleton()->get_editor_theme();
+	if (theme.is_valid()) {
+		stop_icon = theme->get_icon("Stop", "EditorIcons");
+	} else {
+		stop_icon.instantiate();
+	}
+}
+
+EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() {
+	server->stop();
+	server_quit = true;
+	server_thread.wait_to_finish();
+}
diff --git a/platform/javascript/export/export_plugin.h b/platform/javascript/export/export_plugin.h
new file mode 100644
index 0000000000..736edfe3a8
--- /dev/null
+++ b/platform/javascript/export/export_plugin.h
@@ -0,0 +1,149 @@
+/*************************************************************************/
+/*  export_plugin.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef JAVASCRIPT_EXPORT_PLUGIN_H
+#define JAVASCRIPT_EXPORT_PLUGIN_H
+
+#include "core/io/image_loader.h"
+#include "core/io/stream_peer_ssl.h"
+#include "core/io/tcp_server.h"
+#include "core/io/zip_io.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+#include "main/splash.gen.h"
+#include "platform/javascript/logo.gen.h"
+#include "platform/javascript/run_icon.gen.h"
+
+#include "export_server.h"
+
+class EditorExportPlatformJavaScript : public EditorExportPlatform {
+	GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform);
+
+	Ref<ImageTexture> logo;
+	Ref<ImageTexture> run_icon;
+	Ref<ImageTexture> stop_icon;
+	int menu_options = 0;
+
+	Ref<EditorHTTPServer> server;
+	bool server_quit = false;
+	Mutex server_lock;
+	Thread server_thread;
+
+	enum ExportMode {
+		EXPORT_MODE_NORMAL = 0,
+		EXPORT_MODE_THREADS = 1,
+		EXPORT_MODE_GDNATIVE = 2,
+	};
+
+	String _get_template_name(ExportMode p_mode, bool p_debug) const {
+		String name = "webassembly";
+		switch (p_mode) {
+			case EXPORT_MODE_THREADS:
+				name += "_threads";
+				break;
+			case EXPORT_MODE_GDNATIVE:
+				name += "_gdnative";
+				break;
+			default:
+				break;
+		}
+		if (p_debug) {
+			name += "_debug.zip";
+		} else {
+			name += "_release.zip";
+		}
+		return name;
+	}
+
+	Ref<Image> _get_project_icon() const {
+		Ref<Image> icon;
+		icon.instantiate();
+		const String icon_path = String(GLOBAL_GET("application/config/icon")).strip_edges();
+		if (icon_path.is_empty() || ImageLoader::load_image(icon_path, icon) != OK) {
+			return EditorNode::get_singleton()->get_editor_theme()->get_icon("DefaultProjectIcon", "EditorIcons")->get_image();
+		}
+		return icon;
+	}
+
+	Ref<Image> _get_project_splash() const {
+		Ref<Image> splash;
+		splash.instantiate();
+		const String splash_path = String(GLOBAL_GET("application/boot_splash/image")).strip_edges();
+		if (splash_path.is_empty() || ImageLoader::load_image(splash_path, splash) != OK) {
+			return Ref<Image>(memnew(Image(boot_splash_png)));
+		}
+		return splash;
+	}
+
+	Error _extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa);
+	void _replace_strings(Map<String, String> p_replaces, Vector<uint8_t> &r_template);
+	void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, int p_flags, const Vector<SharedObject> p_shared_objects, const Dictionary &p_file_sizes);
+	Error _add_manifest_icon(const String &p_path, const String &p_icon, int p_size, Array &r_arr);
+	Error _build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects);
+	Error _write_or_error(const uint8_t *p_content, int p_len, String p_path);
+
+	static void _server_thread_poll(void *data);
+
+public:
+	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
+
+	virtual void get_export_options(List<ExportOption> *r_options) override;
+
+	virtual String get_name() const override;
+	virtual String get_os_name() const override;
+	virtual Ref<Texture2D> get_logo() const override;
+
+	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
+
+	virtual bool poll_export() override;
+	virtual int get_options_count() const override;
+	virtual String get_option_label(int p_index) const override { return p_index ? TTR("Stop HTTP Server") : TTR("Run in Browser"); }
+	virtual String get_option_tooltip(int p_index) const override { return p_index ? TTR("Stop HTTP Server") : TTR("Run exported HTML in the system's default browser."); }
+	virtual Ref<ImageTexture> get_option_icon(int p_index) const override;
+	virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_option, int p_debug_flags) override;
+	virtual Ref<Texture2D> get_run_icon() const override;
+
+	virtual void get_platform_features(List<String> *r_features) override {
+		r_features->push_back("web");
+		r_features->push_back(get_os_name());
+	}
+
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
+	}
+
+	String get_debug_protocol() const override { return "ws://"; }
+
+	EditorExportPlatformJavaScript();
+	~EditorExportPlatformJavaScript();
+};
+
+#endif
diff --git a/platform/javascript/export/export_server.h b/platform/javascript/export/export_server.h
new file mode 100644
index 0000000000..87cbdcab47
--- /dev/null
+++ b/platform/javascript/export/export_server.h
@@ -0,0 +1,254 @@
+/*************************************************************************/
+/*  export_server.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef JAVASCRIPT_EXPORT_SERVER_H
+#define JAVASCRIPT_EXPORT_SERVER_H
+
+#include "core/io/image_loader.h"
+#include "core/io/stream_peer_ssl.h"
+#include "core/io/tcp_server.h"
+#include "core/io/zip_io.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+
+class EditorHTTPServer : public RefCounted {
+private:
+	Ref<TCPServer> server;
+	Map<String, String> mimes;
+	Ref<StreamPeerTCP> tcp;
+	Ref<StreamPeerSSL> ssl;
+	Ref<StreamPeer> peer;
+	Ref<CryptoKey> key;
+	Ref<X509Certificate> cert;
+	bool use_ssl = false;
+	uint64_t time = 0;
+	uint8_t req_buf[4096];
+	int req_pos = 0;
+
+	void _clear_client() {
+		peer = Ref<StreamPeer>();
+		ssl = Ref<StreamPeerSSL>();
+		tcp = Ref<StreamPeerTCP>();
+		memset(req_buf, 0, sizeof(req_buf));
+		time = 0;
+		req_pos = 0;
+	}
+
+	void _set_internal_certs(Ref<Crypto> p_crypto) {
+		const String cache_path = EditorPaths::get_singleton()->get_cache_dir();
+		const String key_path = cache_path.plus_file("html5_server.key");
+		const String crt_path = cache_path.plus_file("html5_server.crt");
+		bool regen = !FileAccess::exists(key_path) || !FileAccess::exists(crt_path);
+		if (!regen) {
+			key = Ref<CryptoKey>(CryptoKey::create());
+			cert = Ref<X509Certificate>(X509Certificate::create());
+			if (key->load(key_path) != OK || cert->load(crt_path) != OK) {
+				regen = true;
+			}
+		}
+		if (regen) {
+			key = p_crypto->generate_rsa(2048);
+			key->save(key_path);
+			cert = p_crypto->generate_self_signed_certificate(key, "CN=godot-debug.local,O=A Game Dev,C=XXA", "20140101000000", "20340101000000");
+			cert->save(crt_path);
+		}
+	}
+
+public:
+	EditorHTTPServer() {
+		mimes["html"] = "text/html";
+		mimes["js"] = "application/javascript";
+		mimes["json"] = "application/json";
+		mimes["pck"] = "application/octet-stream";
+		mimes["png"] = "image/png";
+		mimes["svg"] = "image/svg";
+		mimes["wasm"] = "application/wasm";
+		server.instantiate();
+		stop();
+	}
+
+	void stop() {
+		server->stop();
+		_clear_client();
+	}
+
+	Error listen(int p_port, IPAddress p_address, bool p_use_ssl, String p_ssl_key, String p_ssl_cert) {
+		use_ssl = p_use_ssl;
+		if (use_ssl) {
+			Ref<Crypto> crypto = Crypto::create();
+			if (crypto.is_null()) {
+				return ERR_UNAVAILABLE;
+			}
+			if (!p_ssl_key.is_empty() && !p_ssl_cert.is_empty()) {
+				key = Ref<CryptoKey>(CryptoKey::create());
+				Error err = key->load(p_ssl_key);
+				ERR_FAIL_COND_V(err != OK, err);
+				cert = Ref<X509Certificate>(X509Certificate::create());
+				err = cert->load(p_ssl_cert);
+				ERR_FAIL_COND_V(err != OK, err);
+			} else {
+				_set_internal_certs(crypto);
+			}
+		}
+		return server->listen(p_port, p_address);
+	}
+
+	bool is_listening() const {
+		return server->is_listening();
+	}
+
+	void _send_response() {
+		Vector<String> psa = String((char *)req_buf).split("\r\n");
+		int len = psa.size();
+		ERR_FAIL_COND_MSG(len < 4, "Not enough response headers, got: " + itos(len) + ", expected >= 4.");
+
+		Vector<String> req = psa[0].split(" ", false);
+		ERR_FAIL_COND_MSG(req.size() < 2, "Invalid protocol or status code.");
+
+		// Wrong protocol
+		ERR_FAIL_COND_MSG(req[0] != "GET" || req[2] != "HTTP/1.1", "Invalid method or HTTP version.");
+
+		const int query_index = req[1].find_char('?');
+		const String path = (query_index == -1) ? req[1] : req[1].substr(0, query_index);
+
+		const String req_file = path.get_file();
+		const String req_ext = path.get_extension();
+		const String cache_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("web");
+		const String filepath = cache_path.plus_file(req_file);
+
+		if (!mimes.has(req_ext) || !FileAccess::exists(filepath)) {
+			String s = "HTTP/1.1 404 Not Found\r\n";
+			s += "Connection: Close\r\n";
+			s += "\r\n";
+			CharString cs = s.utf8();
+			peer->put_data((const uint8_t *)cs.get_data(), cs.size() - 1);
+			return;
+		}
+		const String ctype = mimes[req_ext];
+
+		FileAccess *f = FileAccess::open(filepath, FileAccess::READ);
+		ERR_FAIL_COND(!f);
+		String s = "HTTP/1.1 200 OK\r\n";
+		s += "Connection: Close\r\n";
+		s += "Content-Type: " + ctype + "\r\n";
+		s += "Access-Control-Allow-Origin: *\r\n";
+		s += "Cross-Origin-Opener-Policy: same-origin\r\n";
+		s += "Cross-Origin-Embedder-Policy: require-corp\r\n";
+		s += "Cache-Control: no-store, max-age=0\r\n";
+		s += "\r\n";
+		CharString cs = s.utf8();
+		Error err = peer->put_data((const uint8_t *)cs.get_data(), cs.size() - 1);
+		if (err != OK) {
+			memdelete(f);
+			ERR_FAIL();
+		}
+
+		while (true) {
+			uint8_t bytes[4096];
+			uint64_t read = f->get_buffer(bytes, 4096);
+			if (read == 0) {
+				break;
+			}
+			err = peer->put_data(bytes, read);
+			if (err != OK) {
+				memdelete(f);
+				ERR_FAIL();
+			}
+		}
+		memdelete(f);
+	}
+
+	void poll() {
+		if (!server->is_listening()) {
+			return;
+		}
+		if (tcp.is_null()) {
+			if (!server->is_connection_available()) {
+				return;
+			}
+			tcp = server->take_connection();
+			peer = tcp;
+			time = OS::get_singleton()->get_ticks_usec();
+		}
+		if (OS::get_singleton()->get_ticks_usec() - time > 1000000) {
+			_clear_client();
+			return;
+		}
+		if (tcp->get_status() != StreamPeerTCP::STATUS_CONNECTED) {
+			return;
+		}
+
+		if (use_ssl) {
+			if (ssl.is_null()) {
+				ssl = Ref<StreamPeerSSL>(StreamPeerSSL::create());
+				peer = ssl;
+				ssl->set_blocking_handshake_enabled(false);
+				if (ssl->accept_stream(tcp, key, cert) != OK) {
+					_clear_client();
+					return;
+				}
+			}
+			ssl->poll();
+			if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING) {
+				// Still handshaking, keep waiting.
+				return;
+			}
+			if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
+				_clear_client();
+				return;
+			}
+		}
+
+		while (true) {
+			char *r = (char *)req_buf;
+			int l = req_pos - 1;
+			if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
+				_send_response();
+				_clear_client();
+				return;
+			}
+
+			int read = 0;
+			ERR_FAIL_COND(req_pos >= 4096);
+			Error err = peer->get_partial_data(&req_buf[req_pos], 1, read);
+			if (err != OK) {
+				// Got an error
+				_clear_client();
+				return;
+			} else if (read != 1) {
+				// Busy, wait next poll
+				return;
+			}
+			req_pos += read;
+		}
+	}
+};
+
+#endif
diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp
index 131c4b821e..1164d76580 100644
--- a/platform/osx/export/export.cpp
+++ b/platform/osx/export/export.cpp
@@ -30,1153 +30,7 @@
 
 #include "export.h"
 
-#include "core/config/project_settings.h"
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
-#include "core/io/resource_saver.h"
-#include "core/io/zip_io.h"
-#include "core/os/os.h"
-#include "core/version.h"
-#include "editor/editor_export.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "platform/osx/logo.gen.h"
-
-#include <sys/stat.h>
-
-class EditorExportPlatformOSX : public EditorExportPlatform {
-	GDCLASS(EditorExportPlatformOSX, EditorExportPlatform);
-
-	int version_code = 0;
-
-	Ref<ImageTexture> logo;
-
-	void _fix_plist(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist, const String &p_binary);
-	void _make_icon(const Ref<Image> &p_icon, Vector<uint8_t> &p_data);
-
-	Error _notarize(const Ref<EditorExportPreset> &p_preset, const String &p_path);
-	Error _code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path, const String &p_ent_path);
-	Error _create_dmg(const String &p_dmg_path, const String &p_pkg_name, const String &p_app_path_name);
-	void _zip_folder_recursive(zipFile &p_zip, const String &p_root_path, const String &p_folder, const String &p_pkg_name);
-
-#ifdef OSX_ENABLED
-	bool use_codesign() const { return true; }
-	bool use_dmg() const { return true; }
-#else
-	bool use_codesign() const { return false; }
-	bool use_dmg() const { return false; }
-#endif
-	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const {
-		String pname = p_package;
-
-		if (pname.length() == 0) {
-			if (r_error) {
-				*r_error = TTR("Identifier is missing.");
-			}
-			return false;
-		}
-
-		for (int i = 0; i < pname.length(); i++) {
-			char32_t c = pname[i];
-			if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) {
-				if (r_error) {
-					*r_error = vformat(TTR("The character '%s' is not allowed in Identifier."), String::chr(c));
-				}
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-protected:
-	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
-	virtual void get_export_options(List<ExportOption> *r_options) override;
-
-public:
-	virtual String get_name() const override { return "macOS"; }
-	virtual String get_os_name() const override { return "macOS"; }
-	virtual Ref<Texture2D> get_logo() const override { return logo; }
-
-	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override {
-		List<String> list;
-		if (use_dmg()) {
-			list.push_back("dmg");
-		}
-		list.push_back("zip");
-		return list;
-	}
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
-
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
-
-	virtual void get_platform_features(List<String> *r_features) override {
-		r_features->push_back("pc");
-		r_features->push_back("s3tc");
-		r_features->push_back("macOS");
-	}
-
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
-	}
-
-	EditorExportPlatformOSX();
-	~EditorExportPlatformOSX();
-};
-
-void EditorExportPlatformOSX::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
-	if (p_preset->get("texture_format/s3tc")) {
-		r_features->push_back("s3tc");
-	}
-	if (p_preset->get("texture_format/etc")) {
-		r_features->push_back("etc");
-	}
-	if (p_preset->get("texture_format/etc2")) {
-		r_features->push_back("etc2");
-	}
-
-	r_features->push_back("64");
-}
-
-void EditorExportPlatformOSX::get_export_options(List<ExportOption> *r_options) {
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.png,*.icns"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/bundle_identifier", PROPERTY_HINT_PLACEHOLDER_TEXT, "com.example.game"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/signature"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/app_category", PROPERTY_HINT_ENUM, "Business,Developer-tools,Education,Entertainment,Finance,Games,Action-games,Adventure-games,Arcade-games,Board-games,Card-games,Casino-games,Dice-games,Educational-games,Family-games,Kids-games,Music-games,Puzzle-games,Racing-games,Role-playing-games,Simulation-games,Sports-games,Strategy-games,Trivia-games,Word-games,Graphics-design,Healthcare-fitness,Lifestyle,Medical,Music,News,Photography,Productivity,Reference,Social-networking,Sports,Travel,Utilities,Video,Weather"), "Games"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version"), "1.0"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version"), "1.0"));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "display/high_res"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/camera_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the camera"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/microphone_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the microphone"), ""));
-
-#ifdef OSX_ENABLED
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/enable"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/identity", PROPERTY_HINT_PLACEHOLDER_TEXT, "Type: Name (ID)"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/timestamp"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/hardened_runtime"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/replace_existing_signature"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/entitlements/custom_file", PROPERTY_HINT_GLOBAL_FILE, "*.plist"), ""));
-
-	if (!Engine::get_singleton()->has_singleton("GodotSharp")) {
-		// These entitlements are required to run managed code, and are always enabled in Mono builds.
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/allow_jit_code_execution"), false));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/allow_unsigned_executable_memory"), false));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/allow_dyld_environment_variables"), false));
-	}
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/disable_library_validation"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/audio_input"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/camera"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/location"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/address_book"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/calendars"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/photos_library"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/apple_events"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/debugging"), false));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/enabled"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/network_server"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/network_client"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/device_usb"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/device_bluetooth"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_downloads", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_pictures", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_music", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_movies", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "codesign/custom_options"), PackedStringArray()));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "notarization/enable"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "notarization/apple_id_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Apple ID email"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "notarization/apple_id_password", PROPERTY_HINT_PLACEHOLDER_TEXT, "Enable two-factor authentication and provide app-specific password"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "notarization/apple_team_id", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide team ID if your Apple ID belongs to multiple teams"), ""));
-#endif
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), false));
-}
-
-void _rgba8_to_packbits_encode(int p_ch, int p_size, Vector<uint8_t> &p_source, Vector<uint8_t> &p_dest) {
-	int src_len = p_size * p_size;
-
-	Vector<uint8_t> result;
-	result.resize(src_len * 1.25); //temp vector for rle encoded data, make it 25% larger for worst case scenario
-	int res_size = 0;
-
-	uint8_t buf[128];
-	int buf_size = 0;
-
-	int i = 0;
-	while (i < src_len) {
-		uint8_t cur = p_source.ptr()[i * 4 + p_ch];
-
-		if (i < src_len - 2) {
-			if ((p_source.ptr()[(i + 1) * 4 + p_ch] == cur) && (p_source.ptr()[(i + 2) * 4 + p_ch] == cur)) {
-				if (buf_size > 0) {
-					result.write[res_size++] = (uint8_t)(buf_size - 1);
-					memcpy(&result.write[res_size], &buf, buf_size);
-					res_size += buf_size;
-					buf_size = 0;
-				}
-
-				uint8_t lim = i + 130 >= src_len ? src_len - i - 1 : 130;
-				bool hit_lim = true;
-
-				for (int j = 3; j <= lim; j++) {
-					if (p_source.ptr()[(i + j) * 4 + p_ch] != cur) {
-						hit_lim = false;
-						i = i + j - 1;
-						result.write[res_size++] = (uint8_t)(j - 3 + 0x80);
-						result.write[res_size++] = cur;
-						break;
-					}
-				}
-				if (hit_lim) {
-					result.write[res_size++] = (uint8_t)(lim - 3 + 0x80);
-					result.write[res_size++] = cur;
-					i = i + lim;
-				}
-			} else {
-				buf[buf_size++] = cur;
-				if (buf_size == 128) {
-					result.write[res_size++] = (uint8_t)(buf_size - 1);
-					memcpy(&result.write[res_size], &buf, buf_size);
-					res_size += buf_size;
-					buf_size = 0;
-				}
-			}
-		} else {
-			buf[buf_size++] = cur;
-			result.write[res_size++] = (uint8_t)(buf_size - 1);
-			memcpy(&result.write[res_size], &buf, buf_size);
-			res_size += buf_size;
-			buf_size = 0;
-		}
-
-		i++;
-	}
-
-	int ofs = p_dest.size();
-	p_dest.resize(p_dest.size() + res_size);
-	memcpy(&p_dest.write[ofs], result.ptr(), res_size);
-}
-
-void EditorExportPlatformOSX::_make_icon(const Ref<Image> &p_icon, Vector<uint8_t> &p_data) {
-	Ref<ImageTexture> it = memnew(ImageTexture);
-
-	Vector<uint8_t> data;
-
-	data.resize(8);
-	data.write[0] = 'i';
-	data.write[1] = 'c';
-	data.write[2] = 'n';
-	data.write[3] = 's';
-
-	struct MacOSIconInfo {
-		const char *name;
-		const char *mask_name;
-		bool is_png;
-		int size;
-	};
-
-	static const MacOSIconInfo icon_infos[] = {
-		{ "ic10", "", true, 1024 }, //1024x1024 32-bit PNG and 512x512@2x 32-bit "retina" PNG
-		{ "ic09", "", true, 512 }, //512×512 32-bit PNG
-		{ "ic14", "", true, 512 }, //256x256@2x 32-bit "retina" PNG
-		{ "ic08", "", true, 256 }, //256×256 32-bit PNG
-		{ "ic13", "", true, 256 }, //128x128@2x 32-bit "retina" PNG
-		{ "ic07", "", true, 128 }, //128x128 32-bit PNG
-		{ "ic12", "", true, 64 }, //32x32@2x 32-bit "retina" PNG
-		{ "ic11", "", true, 32 }, //16x16@2x 32-bit "retina" PNG
-		{ "il32", "l8mk", false, 32 }, //32x32 24-bit RLE + 8-bit uncompressed mask
-		{ "is32", "s8mk", false, 16 } //16x16 24-bit RLE + 8-bit uncompressed mask
-	};
-
-	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
-		Ref<Image> copy = p_icon; // does this make sense? doesn't this just increase the reference count instead of making a copy? Do we even need a copy?
-		copy->convert(Image::FORMAT_RGBA8);
-		copy->resize(icon_infos[i].size, icon_infos[i].size);
-
-		if (icon_infos[i].is_png) {
-			// Encode PNG icon.
-			it->create_from_image(copy);
-			String path = EditorPaths::get_singleton()->get_cache_dir().plus_file("icon.png");
-			ResourceSaver::save(path, it);
-
-			FileAccess *f = FileAccess::open(path, FileAccess::READ);
-			if (!f) {
-				// Clean up generated file.
-				DirAccess::remove_file_or_error(path);
-				ERR_FAIL();
-			}
-
-			int ofs = data.size();
-			uint64_t len = f->get_length();
-			data.resize(data.size() + len + 8);
-			f->get_buffer(&data.write[ofs + 8], len);
-			memdelete(f);
-			len += 8;
-			len = BSWAP32(len);
-			memcpy(&data.write[ofs], icon_infos[i].name, 4);
-			encode_uint32(len, &data.write[ofs + 4]);
-
-			// Clean up generated file.
-			DirAccess::remove_file_or_error(path);
-
-		} else {
-			Vector<uint8_t> src_data = copy->get_data();
-
-			//encode 24bit RGB RLE icon
-			{
-				int ofs = data.size();
-				data.resize(data.size() + 8);
-
-				_rgba8_to_packbits_encode(0, icon_infos[i].size, src_data, data); // encode R
-				_rgba8_to_packbits_encode(1, icon_infos[i].size, src_data, data); // encode G
-				_rgba8_to_packbits_encode(2, icon_infos[i].size, src_data, data); // encode B
-
-				int len = data.size() - ofs;
-				len = BSWAP32(len);
-				memcpy(&data.write[ofs], icon_infos[i].name, 4);
-				encode_uint32(len, &data.write[ofs + 4]);
-			}
-
-			//encode 8bit mask uncompressed icon
-			{
-				int ofs = data.size();
-				int len = copy->get_width() * copy->get_height();
-				data.resize(data.size() + len + 8);
-
-				for (int j = 0; j < len; j++) {
-					data.write[ofs + 8 + j] = src_data.ptr()[j * 4 + 3];
-				}
-				len += 8;
-				len = BSWAP32(len);
-				memcpy(&data.write[ofs], icon_infos[i].mask_name, 4);
-				encode_uint32(len, &data.write[ofs + 4]);
-			}
-		}
-	}
-
-	uint32_t total_len = data.size();
-	total_len = BSWAP32(total_len);
-	encode_uint32(total_len, &data.write[4]);
-
-	p_data = data;
-}
-
-void EditorExportPlatformOSX::_fix_plist(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist, const String &p_binary) {
-	String str;
-	String strnew;
-	str.parse_utf8((const char *)plist.ptr(), plist.size());
-	Vector<String> lines = str.split("\n");
-	for (int i = 0; i < lines.size(); i++) {
-		if (lines[i].find("$binary") != -1) {
-			strnew += lines[i].replace("$binary", p_binary) + "\n";
-		} else if (lines[i].find("$name") != -1) {
-			strnew += lines[i].replace("$name", p_binary) + "\n";
-		} else if (lines[i].find("$info") != -1) {
-			strnew += lines[i].replace("$info", p_preset->get("application/info")) + "\n";
-		} else if (lines[i].find("$bundle_identifier") != -1) {
-			strnew += lines[i].replace("$bundle_identifier", p_preset->get("application/bundle_identifier")) + "\n";
-		} else if (lines[i].find("$short_version") != -1) {
-			strnew += lines[i].replace("$short_version", p_preset->get("application/short_version")) + "\n";
-		} else if (lines[i].find("$version") != -1) {
-			strnew += lines[i].replace("$version", p_preset->get("application/version")) + "\n";
-		} else if (lines[i].find("$signature") != -1) {
-			strnew += lines[i].replace("$signature", p_preset->get("application/signature")) + "\n";
-		} else if (lines[i].find("$app_category") != -1) {
-			String cat = p_preset->get("application/app_category");
-			strnew += lines[i].replace("$app_category", cat.to_lower()) + "\n";
-		} else if (lines[i].find("$copyright") != -1) {
-			strnew += lines[i].replace("$copyright", p_preset->get("application/copyright")) + "\n";
-		} else if (lines[i].find("$highres") != -1) {
-			strnew += lines[i].replace("$highres", p_preset->get("display/high_res") ? "<true/>" : "<false/>") + "\n";
-		} else if (lines[i].find("$camera_usage_description") != -1) {
-			String description = p_preset->get("privacy/camera_usage_description");
-			strnew += lines[i].replace("$camera_usage_description", description) + "\n";
-		} else if (lines[i].find("$microphone_usage_description") != -1) {
-			String description = p_preset->get("privacy/microphone_usage_description");
-			strnew += lines[i].replace("$microphone_usage_description", description) + "\n";
-		} else {
-			strnew += lines[i] + "\n";
-		}
-	}
-
-	CharString cs = strnew.utf8();
-	plist.resize(cs.size() - 1);
-	for (int i = 0; i < cs.size() - 1; i++) {
-		plist.write[i] = cs[i];
-	}
-}
-
-/**
-	If we're running the OSX version of the Godot editor we'll:
-	- export our application bundle to a temporary folder
-	- attempt to code sign it
-	- and then wrap it up in a DMG
-**/
-
-Error EditorExportPlatformOSX::_notarize(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
-#ifdef OSX_ENABLED
-	List<String> args;
-
-	args.push_back("altool");
-	args.push_back("--notarize-app");
-
-	args.push_back("--primary-bundle-id");
-	args.push_back(p_preset->get("application/bundle_identifier"));
-
-	args.push_back("--username");
-	args.push_back(p_preset->get("notarization/apple_id_name"));
-
-	args.push_back("--password");
-	args.push_back(p_preset->get("notarization/apple_id_password"));
-
-	args.push_back("--type");
-	args.push_back("osx");
-
-	if (p_preset->get("notarization/apple_team_id")) {
-		args.push_back("--asc-provider");
-		args.push_back(p_preset->get("notarization/apple_team_id"));
-	}
-
-	args.push_back("--file");
-	args.push_back(p_path);
-
-	String str;
-	Error err = OS::get_singleton()->execute("xcrun", args, &str, nullptr, true);
-	ERR_FAIL_COND_V(err != OK, err);
-
-	print_line("altool (" + p_path + "):\n" + str);
-	if (str.find("RequestUUID") == -1) {
-		EditorNode::add_io_error("altool: " + str);
-		return FAILED;
-	} else {
-		print_line("Note: The notarization process generally takes less than an hour. When the process is completed, you'll receive an email.");
-		print_line("      You can check progress manually by opening a Terminal and running the following command:");
-		print_line("      \"xcrun altool --notarization-history 0 -u <your email> -p <app-specific pwd>\"");
-	}
-
-#endif
-
-	return OK;
-}
-
-Error EditorExportPlatformOSX::_code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path, const String &p_ent_path) {
-#ifdef OSX_ENABLED
-	List<String> args;
-
-	if (p_preset->get("codesign/timestamp")) {
-		args.push_back("--timestamp");
-	}
-	if (p_preset->get("codesign/hardened_runtime")) {
-		args.push_back("--options");
-		args.push_back("runtime");
-	}
-
-	if (p_path.get_extension() != "dmg") {
-		args.push_back("--entitlements");
-		args.push_back(p_ent_path);
-	}
-
-	PackedStringArray user_args = p_preset->get("codesign/custom_options");
-	for (int i = 0; i < user_args.size(); i++) {
-		String user_arg = user_args[i].strip_edges();
-		if (!user_arg.is_empty()) {
-			args.push_back(user_arg);
-		}
-	}
-
-	args.push_back("-s");
-	if (p_preset->get("codesign/identity") == "") {
-		args.push_back("-");
-	} else {
-		args.push_back(p_preset->get("codesign/identity"));
-	}
-
-	args.push_back("-v"); /* provide some more feedback */
-
-	if (p_preset->get("codesign/replace_existing_signature")) {
-		args.push_back("-f");
-	}
-
-	args.push_back(p_path);
-
-	String str;
-	Error err = OS::get_singleton()->execute("codesign", args, &str, nullptr, true);
-	ERR_FAIL_COND_V(err != OK, err);
-
-	print_line("codesign (" + p_path + "):\n" + str);
-	if (str.find("no identity found") != -1) {
-		EditorNode::add_io_error("codesign: no identity found");
-		return FAILED;
-	}
-	if ((str.find("unrecognized blob type") != -1) || (str.find("cannot read entitlement data") != -1)) {
-		EditorNode::add_io_error("codesign: invalid entitlements file");
-		return FAILED;
-	}
-#endif
-
-	return OK;
-}
-
-Error EditorExportPlatformOSX::_create_dmg(const String &p_dmg_path, const String &p_pkg_name, const String &p_app_path_name) {
-	List<String> args;
-
-	if (FileAccess::exists(p_dmg_path)) {
-		OS::get_singleton()->move_to_trash(p_dmg_path);
-	}
-
-	args.push_back("create");
-	args.push_back(p_dmg_path);
-	args.push_back("-volname");
-	args.push_back(p_pkg_name);
-	args.push_back("-fs");
-	args.push_back("HFS+");
-	args.push_back("-srcfolder");
-	args.push_back(p_app_path_name);
-
-	String str;
-	Error err = OS::get_singleton()->execute("hdiutil", args, &str, nullptr, true);
-	ERR_FAIL_COND_V(err != OK, err);
-
-	print_line("hdiutil returned: " + str);
-	if (str.find("create failed") != -1) {
-		if (str.find("File exists") != -1) {
-			EditorNode::add_io_error("hdiutil: create failed - file exists");
-		} else {
-			EditorNode::add_io_error("hdiutil: create failed");
-		}
-		return FAILED;
-	}
-
-	return OK;
-}
-
-Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
-	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-
-	String src_pkg_name;
-
-	EditorProgress ep("export", "Exporting for OSX", 3, true);
-
-	if (p_debug) {
-		src_pkg_name = p_preset->get("custom_template/debug");
-	} else {
-		src_pkg_name = p_preset->get("custom_template/release");
-	}
-
-	if (src_pkg_name == "") {
-		String err;
-		src_pkg_name = find_export_template("osx.zip", &err);
-		if (src_pkg_name == "") {
-			EditorNode::add_io_error(err);
-			return ERR_FILE_NOT_FOUND;
-		}
-	}
-
-	if (!DirAccess::exists(p_path.get_base_dir())) {
-		return ERR_FILE_BAD_PATH;
-	}
-
-	FileAccess *src_f = nullptr;
-	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
-
-	if (ep.step("Creating app", 0)) {
-		return ERR_SKIP;
-	}
-
-	unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io);
-	if (!src_pkg_zip) {
-		EditorNode::add_io_error("Could not find template app to export:\n" + src_pkg_name);
-		return ERR_FILE_NOT_FOUND;
-	}
-
-	int ret = unzGoToFirstFile(src_pkg_zip);
-
-	String binary_to_use = "godot_osx_" + String(p_debug ? "debug" : "release") + ".64";
-
-	String pkg_name;
-	if (p_preset->get("application/name") != "") {
-		pkg_name = p_preset->get("application/name"); // app_name
-	} else if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
-		pkg_name = String(ProjectSettings::get_singleton()->get("application/config/name"));
-	} else {
-		pkg_name = "Unnamed";
-	}
-
-	pkg_name = OS::get_singleton()->get_safe_dir_name(pkg_name);
-
-	String export_format = use_dmg() && p_path.ends_with("dmg") ? "dmg" : "zip";
-
-	// Create our application bundle.
-	String tmp_app_dir_name = pkg_name + ".app";
-	String tmp_app_path_name = EditorPaths::get_singleton()->get_cache_dir().plus_file(tmp_app_dir_name);
-	print_line("Exporting to " + tmp_app_path_name);
-
-	Error err = OK;
-
-	DirAccessRef tmp_app_dir = DirAccess::create_for_path(tmp_app_path_name);
-	if (!tmp_app_dir) {
-		err = ERR_CANT_CREATE;
-	}
-
-	// Create our folder structure.
-	if (err == OK) {
-		print_line("Creating " + tmp_app_path_name + "/Contents/MacOS");
-		err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/MacOS");
-	}
-
-	if (err == OK) {
-		print_line("Creating " + tmp_app_path_name + "/Contents/Frameworks");
-		err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks");
-	}
-
-	if (err == OK) {
-		print_line("Creating " + tmp_app_path_name + "/Contents/Resources");
-		err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/Resources");
-	}
-
-	// Now process our template.
-	bool found_binary = false;
-	int total_size = 0;
-	Vector<String> dylibs_found;
-
-	while (ret == UNZ_OK && err == OK) {
-		bool is_execute = false;
-
-		// Get filename.
-		unz_file_info info;
-		char fname[16384];
-		ret = unzGetCurrentFileInfo(src_pkg_zip, &info, fname, 16384, nullptr, 0, nullptr, 0);
-
-		String file = fname;
-
-		Vector<uint8_t> data;
-		data.resize(info.uncompressed_size);
-
-		// Read.
-		unzOpenCurrentFile(src_pkg_zip);
-		unzReadCurrentFile(src_pkg_zip, data.ptrw(), data.size());
-		unzCloseCurrentFile(src_pkg_zip);
-
-		// Write.
-		file = file.replace_first("osx_template.app/", "");
-
-		if (file == "Contents/Info.plist") {
-			_fix_plist(p_preset, data, pkg_name);
-		}
-
-		if (file.begins_with("Contents/MacOS/godot_")) {
-			if (file != "Contents/MacOS/" + binary_to_use) {
-				ret = unzGoToNextFile(src_pkg_zip);
-				continue; // skip
-			}
-			found_binary = true;
-			is_execute = true;
-			file = "Contents/MacOS/" + pkg_name;
-		}
-
-		if (file == "Contents/Resources/icon.icns") {
-			// See if there is an icon.
-			String iconpath;
-			if (p_preset->get("application/icon") != "") {
-				iconpath = p_preset->get("application/icon");
-			} else {
-				iconpath = ProjectSettings::get_singleton()->get("application/config/icon");
-			}
-
-			if (iconpath != "") {
-				if (iconpath.get_extension() == "icns") {
-					FileAccess *icon = FileAccess::open(iconpath, FileAccess::READ);
-					if (icon) {
-						data.resize(icon->get_length());
-						icon->get_buffer(&data.write[0], icon->get_length());
-						icon->close();
-						memdelete(icon);
-					}
-				} else {
-					Ref<Image> icon;
-					icon.instantiate();
-					icon->load(iconpath);
-					if (!icon->is_empty()) {
-						_make_icon(icon, data);
-					}
-				}
-			}
-		}
-
-		if (data.size() > 0) {
-			if (file.find("/data.mono.osx.64.release_debug/") != -1) {
-				if (!p_debug) {
-					ret = unzGoToNextFile(src_pkg_zip);
-					continue; // skip
-				}
-				file = file.replace("/data.mono.osx.64.release_debug/", "/GodotSharp/");
-			}
-			if (file.find("/data.mono.osx.64.release/") != -1) {
-				if (p_debug) {
-					ret = unzGoToNextFile(src_pkg_zip);
-					continue; // skip
-				}
-				file = file.replace("/data.mono.osx.64.release/", "/GodotSharp/");
-			}
-
-			if (file.ends_with(".dylib")) {
-				dylibs_found.push_back(file);
-			}
-
-			print_line("ADDING: " + file + " size: " + itos(data.size()));
-			total_size += data.size();
-
-			// Write it into our application bundle.
-			file = tmp_app_path_name.plus_file(file);
-			if (err == OK) {
-				err = tmp_app_dir->make_dir_recursive(file.get_base_dir());
-			}
-			if (err == OK) {
-				FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
-				if (f) {
-					f->store_buffer(data.ptr(), data.size());
-					f->close();
-					if (is_execute) {
-						// chmod with 0755 if the file is executable.
-						FileAccess::set_unix_permissions(file, 0755);
-					}
-					memdelete(f);
-				} else {
-					err = ERR_CANT_CREATE;
-				}
-			}
-		}
-
-		ret = unzGoToNextFile(src_pkg_zip);
-	}
-
-	// We're done with our source zip.
-	unzClose(src_pkg_zip);
-
-	if (!found_binary) {
-		ERR_PRINT("Requested template binary '" + binary_to_use + "' not found. It might be missing from your template archive.");
-		err = ERR_FILE_NOT_FOUND;
-	}
-
-	if (err == OK) {
-		if (ep.step("Making PKG", 1)) {
-			return ERR_SKIP;
-		}
-
-		String pack_path = tmp_app_path_name + "/Contents/Resources/" + pkg_name + ".pck";
-		Vector<SharedObject> shared_objects;
-		err = save_pack(p_preset, pack_path, &shared_objects);
-
-		// See if we can code sign our new package.
-		bool sign_enabled = p_preset->get("codesign/enable");
-
-		String ent_path = p_preset->get("codesign/entitlements/custom_file");
-		if (sign_enabled && (ent_path == "")) {
-			ent_path = EditorPaths::get_singleton()->get_cache_dir().plus_file(pkg_name + ".entitlements");
-
-			FileAccess *ent_f = FileAccess::open(ent_path, FileAccess::WRITE);
-			if (ent_f) {
-				ent_f->store_line("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-				ent_f->store_line("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
-				ent_f->store_line("<plist version=\"1.0\">");
-				ent_f->store_line("<dict>");
-				if (Engine::get_singleton()->has_singleton("GodotSharp")) {
-					// These entitlements are required to run managed code, and are always enabled in Mono builds.
-					ent_f->store_line("<key>com.apple.security.cs.allow-jit</key>");
-					ent_f->store_line("<true/>");
-					ent_f->store_line("<key>com.apple.security.cs.allow-unsigned-executable-memory</key>");
-					ent_f->store_line("<true/>");
-					ent_f->store_line("<key>com.apple.security.cs.allow-dyld-environment-variables</key>");
-					ent_f->store_line("<true/>");
-				} else {
-					if ((bool)p_preset->get("codesign/entitlements/allow_jit_code_execution")) {
-						ent_f->store_line("<key>com.apple.security.cs.allow-jit</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((bool)p_preset->get("codesign/entitlements/allow_unsigned_executable_memory")) {
-						ent_f->store_line("<key>com.apple.security.cs.allow-unsigned-executable-memory</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((bool)p_preset->get("codesign/entitlements/allow_dyld_environment_variables")) {
-						ent_f->store_line("<key>com.apple.security.cs.allow-dyld-environment-variables</key>");
-						ent_f->store_line("<true/>");
-					}
-				}
-
-				if ((bool)p_preset->get("codesign/entitlements/disable_library_validation")) {
-					ent_f->store_line("<key>com.apple.security.cs.disable-library-validation</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/audio_input")) {
-					ent_f->store_line("<key>com.apple.security.device.audio-input</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/camera")) {
-					ent_f->store_line("<key>com.apple.security.device.camera</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/location")) {
-					ent_f->store_line("<key>com.apple.security.personal-information.location</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/address_book")) {
-					ent_f->store_line("<key>com.apple.security.personal-information.addressbook</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/calendars")) {
-					ent_f->store_line("<key>com.apple.security.personal-information.calendars</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/photos_library")) {
-					ent_f->store_line("<key>com.apple.security.personal-information.photos-library</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/apple_events")) {
-					ent_f->store_line("<key>com.apple.security.automation.apple-events</key>");
-					ent_f->store_line("<true/>");
-				}
-				if ((bool)p_preset->get("codesign/entitlements/debugging")) {
-					ent_f->store_line("<key>com.apple.security.get-task-allow</key>");
-					ent_f->store_line("<true/>");
-				}
-
-				if ((bool)p_preset->get("codesign/entitlements/app_sandbox/enabled")) {
-					ent_f->store_line("<key>com.apple.security.app-sandbox</key>");
-					ent_f->store_line("<true/>");
-
-					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/network_server")) {
-						ent_f->store_line("<key>com.apple.security.network.server</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/network_client")) {
-						ent_f->store_line("<key>com.apple.security.network.client</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/device_usb")) {
-						ent_f->store_line("<key>com.apple.security.device.usb</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/device_bluetooth")) {
-						ent_f->store_line("<key>com.apple.security.device.bluetooth</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_downloads") == 1) {
-						ent_f->store_line("<key>com.apple.security.files.downloads.read-only</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_downloads") == 2) {
-						ent_f->store_line("<key>com.apple.security.files.downloads.read-write</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_pictures") == 1) {
-						ent_f->store_line("<key>com.apple.security.files.pictures.read-only</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_pictures") == 2) {
-						ent_f->store_line("<key>com.apple.security.files.pictures.read-write</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_music") == 1) {
-						ent_f->store_line("<key>com.apple.security.files.music.read-only</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_music") == 2) {
-						ent_f->store_line("<key>com.apple.security.files.music.read-write</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_movies") == 1) {
-						ent_f->store_line("<key>com.apple.security.files.movies.read-only</key>");
-						ent_f->store_line("<true/>");
-					}
-					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_movies") == 2) {
-						ent_f->store_line("<key>com.apple.security.files.movies.read-write</key>");
-						ent_f->store_line("<true/>");
-					}
-				}
-
-				ent_f->store_line("</dict>");
-				ent_f->store_line("</plist>");
-
-				ent_f->close();
-				memdelete(ent_f);
-			} else {
-				err = ERR_CANT_CREATE;
-			}
-		}
-
-		if (err == OK) {
-			DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-			for (int i = 0; i < shared_objects.size(); i++) {
-				String src_path = ProjectSettings::get_singleton()->globalize_path(shared_objects[i].path);
-				if (da->dir_exists(src_path)) {
-#ifndef UNIX_ENABLED
-					WARN_PRINT("Relative symlinks are not supported, exported " + src_path.get_file() + " might be broken!");
-#endif
-					print_verbose("export framework: " + src_path + " -> " + tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
-					err = da->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
-					if (err == OK) {
-						err = da->copy_dir(src_path, tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file(), -1, true);
-					}
-				} else {
-					print_verbose("export dylib: " + src_path + " -> " + tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
-					err = da->copy(src_path, tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
-				}
-				if (err == OK && sign_enabled) {
-					err = _code_sign(p_preset, tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file(), ent_path);
-				}
-			}
-			memdelete(da);
-		}
-
-		if (sign_enabled) {
-			for (int i = 0; i < dylibs_found.size(); i++) {
-				if (err == OK) {
-					err = _code_sign(p_preset, tmp_app_path_name + "/" + dylibs_found[i], ent_path);
-				}
-			}
-		}
-
-		if (err == OK && sign_enabled) {
-			if (ep.step("Code signing bundle", 2)) {
-				return ERR_SKIP;
-			}
-			err = _code_sign(p_preset, tmp_app_path_name + "/Contents/MacOS/" + pkg_name, ent_path);
-		}
-
-		if (export_format == "dmg") {
-			// Create a DMG.
-			if (err == OK) {
-				if (ep.step("Making DMG", 3)) {
-					return ERR_SKIP;
-				}
-				err = _create_dmg(p_path, pkg_name, tmp_app_path_name);
-			}
-			// Sign DMG.
-			if (err == OK && sign_enabled) {
-				if (ep.step("Code signing DMG", 3)) {
-					return ERR_SKIP;
-				}
-				err = _code_sign(p_preset, p_path, ent_path);
-			}
-		} else {
-			// Create ZIP.
-			if (err == OK) {
-				if (ep.step("Making ZIP", 3)) {
-					return ERR_SKIP;
-				}
-				if (FileAccess::exists(p_path)) {
-					OS::get_singleton()->move_to_trash(p_path);
-				}
-
-				FileAccess *dst_f = nullptr;
-				zlib_filefunc_def io_dst = zipio_create_io_from_file(&dst_f);
-				zipFile zip = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io_dst);
-
-				_zip_folder_recursive(zip, EditorPaths::get_singleton()->get_cache_dir(), pkg_name + ".app", pkg_name);
-
-				zipClose(zip, nullptr);
-			}
-		}
-
-		bool noto_enabled = p_preset->get("notarization/enable");
-		if (err == OK && noto_enabled) {
-			if (ep.step("Sending archive for notarization", 4)) {
-				return ERR_SKIP;
-			}
-			err = _notarize(p_preset, p_path);
-		}
-
-		// Clean up temporary .app dir.
-		tmp_app_dir->change_dir(tmp_app_path_name);
-		tmp_app_dir->erase_contents_recursive();
-		tmp_app_dir->change_dir("..");
-		tmp_app_dir->remove(tmp_app_dir_name);
-	}
-
-	return err;
-}
-
-void EditorExportPlatformOSX::_zip_folder_recursive(zipFile &p_zip, const String &p_root_path, const String &p_folder, const String &p_pkg_name) {
-	String dir = p_root_path.plus_file(p_folder);
-
-	DirAccess *da = DirAccess::open(dir);
-	da->list_dir_begin();
-	String f;
-	while ((f = da->get_next()) != "") {
-		if (f == "." || f == "..") {
-			continue;
-		}
-		if (da->is_link(f)) {
-			OS::Time time = OS::get_singleton()->get_time();
-			OS::Date date = OS::get_singleton()->get_date();
-
-			zip_fileinfo zipfi;
-			zipfi.tmz_date.tm_hour = time.hour;
-			zipfi.tmz_date.tm_mday = date.day;
-			zipfi.tmz_date.tm_min = time.minute;
-			zipfi.tmz_date.tm_mon = date.month - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, http://www.cplusplus.com/reference/ctime/tm/
-			zipfi.tmz_date.tm_sec = time.second;
-			zipfi.tmz_date.tm_year = date.year;
-			zipfi.dosDate = 0;
-			// 0120000: symbolic link type
-			// 0000755: permissions rwxr-xr-x
-			// 0000644: permissions rw-r--r--
-			uint32_t _mode = 0120644;
-			zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
-			zipfi.internal_fa = 0;
-
-			zipOpenNewFileInZip4(p_zip,
-					p_folder.plus_file(f).utf8().get_data(),
-					&zipfi,
-					nullptr,
-					0,
-					nullptr,
-					0,
-					nullptr,
-					Z_DEFLATED,
-					Z_DEFAULT_COMPRESSION,
-					0,
-					-MAX_WBITS,
-					DEF_MEM_LEVEL,
-					Z_DEFAULT_STRATEGY,
-					nullptr,
-					0,
-					0x0314, // "version made by", 0x03 - Unix, 0x14 - ZIP specification version 2.0, required to store Unix file permissions
-					0);
-
-			String target = da->read_link(f);
-			zipWriteInFileInZip(p_zip, target.utf8().get_data(), target.utf8().size());
-			zipCloseFileInZip(p_zip);
-		} else if (da->current_is_dir()) {
-			_zip_folder_recursive(p_zip, p_root_path, p_folder.plus_file(f), p_pkg_name);
-		} else {
-			bool is_executable = (p_folder.ends_with("MacOS") && (f == p_pkg_name));
-
-			OS::Time time = OS::get_singleton()->get_time();
-			OS::Date date = OS::get_singleton()->get_date();
-
-			zip_fileinfo zipfi;
-			zipfi.tmz_date.tm_hour = time.hour;
-			zipfi.tmz_date.tm_mday = date.day;
-			zipfi.tmz_date.tm_min = time.minute;
-			zipfi.tmz_date.tm_mon = date.month - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, http://www.cplusplus.com/reference/ctime/tm/
-			zipfi.tmz_date.tm_sec = time.second;
-			zipfi.tmz_date.tm_year = date.year;
-			zipfi.dosDate = 0;
-			// 0100000: regular file type
-			// 0000755: permissions rwxr-xr-x
-			// 0000644: permissions rw-r--r--
-			uint32_t _mode = (is_executable ? 0100755 : 0100644);
-			zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
-			zipfi.internal_fa = 0;
-
-			zipOpenNewFileInZip4(p_zip,
-					p_folder.plus_file(f).utf8().get_data(),
-					&zipfi,
-					nullptr,
-					0,
-					nullptr,
-					0,
-					nullptr,
-					Z_DEFLATED,
-					Z_DEFAULT_COMPRESSION,
-					0,
-					-MAX_WBITS,
-					DEF_MEM_LEVEL,
-					Z_DEFAULT_STRATEGY,
-					nullptr,
-					0,
-					0x0314, // "version made by", 0x03 - Unix, 0x14 - ZIP specification version 2.0, required to store Unix file permissions
-					0);
-
-			Vector<uint8_t> array = FileAccess::get_file_as_array(dir.plus_file(f));
-			zipWriteInFileInZip(p_zip, array.ptr(), array.size());
-			zipCloseFileInZip(p_zip);
-		}
-	}
-	da->list_dir_end();
-	memdelete(da);
-}
-
-bool EditorExportPlatformOSX::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
-	String err;
-	bool valid = false;
-
-	// Look for export templates (first official, and if defined custom templates).
-
-	bool dvalid = exists_export_template("osx.zip", &err);
-	bool rvalid = dvalid; // Both in the same ZIP.
-
-	if (p_preset->get("custom_template/debug") != "") {
-		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
-		if (!dvalid) {
-			err += TTR("Custom debug template not found.") + "\n";
-		}
-	}
-	if (p_preset->get("custom_template/release") != "") {
-		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
-		if (!rvalid) {
-			err += TTR("Custom release template not found.") + "\n";
-		}
-	}
-
-	valid = dvalid || rvalid;
-	r_missing_templates = !valid;
-
-	String identifier = p_preset->get("application/bundle_identifier");
-	String pn_err;
-	if (!is_package_name_valid(identifier, &pn_err)) {
-		err += TTR("Invalid bundle identifier:") + " " + pn_err + "\n";
-		valid = false;
-	}
-
-	bool sign_enabled = p_preset->get("codesign/enable");
-	bool noto_enabled = p_preset->get("notarization/enable");
-	if (noto_enabled) {
-		if (!sign_enabled) {
-			err += TTR("Notarization: code signing required.") + "\n";
-			valid = false;
-		}
-		bool hr_enabled = p_preset->get("codesign/hardened_runtime");
-		if (!hr_enabled) {
-			err += TTR("Notarization: hardened runtime required.") + "\n";
-			valid = false;
-		}
-		if (p_preset->get("notarization/apple_id_name") == "") {
-			err += TTR("Notarization: Apple ID name not specified.") + "\n";
-			valid = false;
-		}
-		if (p_preset->get("notarization/apple_id_password") == "") {
-			err += TTR("Notarization: Apple ID password not specified.") + "\n";
-			valid = false;
-		}
-	}
-
-	if (!err.is_empty()) {
-		r_error = err;
-	}
-	return valid;
-}
-
-EditorExportPlatformOSX::EditorExportPlatformOSX() {
-	Ref<Image> img = memnew(Image(_osx_logo));
-	logo.instantiate();
-	logo->create_from_image(img);
-}
-
-EditorExportPlatformOSX::~EditorExportPlatformOSX() {
-}
+#include "export_plugin.h"
 
 void register_osx_exporter() {
 	Ref<EditorExportPlatformOSX> platform;
diff --git a/platform/osx/export/export_plugin.cpp b/platform/osx/export/export_plugin.cpp
new file mode 100644
index 0000000000..53ae1ea6fe
--- /dev/null
+++ b/platform/osx/export/export_plugin.cpp
@@ -0,0 +1,1085 @@
+/*************************************************************************/
+/*  export_plugin.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "export_plugin.h"
+
+void EditorExportPlatformOSX::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
+	if (p_preset->get("texture_format/s3tc")) {
+		r_features->push_back("s3tc");
+	}
+	if (p_preset->get("texture_format/etc")) {
+		r_features->push_back("etc");
+	}
+	if (p_preset->get("texture_format/etc2")) {
+		r_features->push_back("etc2");
+	}
+
+	r_features->push_back("64");
+}
+
+void EditorExportPlatformOSX::get_export_options(List<ExportOption> *r_options) {
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.png,*.icns"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/bundle_identifier", PROPERTY_HINT_PLACEHOLDER_TEXT, "com.example.game"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/signature"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/app_category", PROPERTY_HINT_ENUM, "Business,Developer-tools,Education,Entertainment,Finance,Games,Action-games,Adventure-games,Arcade-games,Board-games,Card-games,Casino-games,Dice-games,Educational-games,Family-games,Kids-games,Music-games,Puzzle-games,Racing-games,Role-playing-games,Simulation-games,Sports-games,Strategy-games,Trivia-games,Word-games,Graphics-design,Healthcare-fitness,Lifestyle,Medical,Music,News,Photography,Productivity,Reference,Social-networking,Sports,Travel,Utilities,Video,Weather"), "Games"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version"), "1.0"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version"), "1.0"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "display/high_res"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/camera_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the camera"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/microphone_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need to use the microphone"), ""));
+
+#ifdef OSX_ENABLED
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/enable"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/identity", PROPERTY_HINT_PLACEHOLDER_TEXT, "Type: Name (ID)"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/timestamp"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/hardened_runtime"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/replace_existing_signature"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/entitlements/custom_file", PROPERTY_HINT_GLOBAL_FILE, "*.plist"), ""));
+
+	if (!Engine::get_singleton()->has_singleton("GodotSharp")) {
+		// These entitlements are required to run managed code, and are always enabled in Mono builds.
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/allow_jit_code_execution"), false));
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/allow_unsigned_executable_memory"), false));
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/allow_dyld_environment_variables"), false));
+	}
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/disable_library_validation"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/audio_input"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/camera"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/location"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/address_book"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/calendars"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/photos_library"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/apple_events"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/debugging"), false));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/enabled"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/network_server"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/network_client"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/device_usb"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/entitlements/app_sandbox/device_bluetooth"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_downloads", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_pictures", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_music", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/entitlements/app_sandbox/files_movies", PROPERTY_HINT_ENUM, "No,Read-only,Read-write"), 0));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "codesign/custom_options"), PackedStringArray()));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "notarization/enable"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "notarization/apple_id_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Apple ID email"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "notarization/apple_id_password", PROPERTY_HINT_PLACEHOLDER_TEXT, "Enable two-factor authentication and provide app-specific password"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "notarization/apple_team_id", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide team ID if your Apple ID belongs to multiple teams"), ""));
+#endif
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), false));
+}
+
+void _rgba8_to_packbits_encode(int p_ch, int p_size, Vector<uint8_t> &p_source, Vector<uint8_t> &p_dest) {
+	int src_len = p_size * p_size;
+
+	Vector<uint8_t> result;
+	result.resize(src_len * 1.25); //temp vector for rle encoded data, make it 25% larger for worst case scenario
+	int res_size = 0;
+
+	uint8_t buf[128];
+	int buf_size = 0;
+
+	int i = 0;
+	while (i < src_len) {
+		uint8_t cur = p_source.ptr()[i * 4 + p_ch];
+
+		if (i < src_len - 2) {
+			if ((p_source.ptr()[(i + 1) * 4 + p_ch] == cur) && (p_source.ptr()[(i + 2) * 4 + p_ch] == cur)) {
+				if (buf_size > 0) {
+					result.write[res_size++] = (uint8_t)(buf_size - 1);
+					memcpy(&result.write[res_size], &buf, buf_size);
+					res_size += buf_size;
+					buf_size = 0;
+				}
+
+				uint8_t lim = i + 130 >= src_len ? src_len - i - 1 : 130;
+				bool hit_lim = true;
+
+				for (int j = 3; j <= lim; j++) {
+					if (p_source.ptr()[(i + j) * 4 + p_ch] != cur) {
+						hit_lim = false;
+						i = i + j - 1;
+						result.write[res_size++] = (uint8_t)(j - 3 + 0x80);
+						result.write[res_size++] = cur;
+						break;
+					}
+				}
+				if (hit_lim) {
+					result.write[res_size++] = (uint8_t)(lim - 3 + 0x80);
+					result.write[res_size++] = cur;
+					i = i + lim;
+				}
+			} else {
+				buf[buf_size++] = cur;
+				if (buf_size == 128) {
+					result.write[res_size++] = (uint8_t)(buf_size - 1);
+					memcpy(&result.write[res_size], &buf, buf_size);
+					res_size += buf_size;
+					buf_size = 0;
+				}
+			}
+		} else {
+			buf[buf_size++] = cur;
+			result.write[res_size++] = (uint8_t)(buf_size - 1);
+			memcpy(&result.write[res_size], &buf, buf_size);
+			res_size += buf_size;
+			buf_size = 0;
+		}
+
+		i++;
+	}
+
+	int ofs = p_dest.size();
+	p_dest.resize(p_dest.size() + res_size);
+	memcpy(&p_dest.write[ofs], result.ptr(), res_size);
+}
+
+void EditorExportPlatformOSX::_make_icon(const Ref<Image> &p_icon, Vector<uint8_t> &p_data) {
+	Ref<ImageTexture> it = memnew(ImageTexture);
+
+	Vector<uint8_t> data;
+
+	data.resize(8);
+	data.write[0] = 'i';
+	data.write[1] = 'c';
+	data.write[2] = 'n';
+	data.write[3] = 's';
+
+	struct MacOSIconInfo {
+		const char *name;
+		const char *mask_name;
+		bool is_png;
+		int size;
+	};
+
+	static const MacOSIconInfo icon_infos[] = {
+		{ "ic10", "", true, 1024 }, //1024x1024 32-bit PNG and 512x512@2x 32-bit "retina" PNG
+		{ "ic09", "", true, 512 }, //512×512 32-bit PNG
+		{ "ic14", "", true, 512 }, //256x256@2x 32-bit "retina" PNG
+		{ "ic08", "", true, 256 }, //256×256 32-bit PNG
+		{ "ic13", "", true, 256 }, //128x128@2x 32-bit "retina" PNG
+		{ "ic07", "", true, 128 }, //128x128 32-bit PNG
+		{ "ic12", "", true, 64 }, //32x32@2x 32-bit "retina" PNG
+		{ "ic11", "", true, 32 }, //16x16@2x 32-bit "retina" PNG
+		{ "il32", "l8mk", false, 32 }, //32x32 24-bit RLE + 8-bit uncompressed mask
+		{ "is32", "s8mk", false, 16 } //16x16 24-bit RLE + 8-bit uncompressed mask
+	};
+
+	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
+		Ref<Image> copy = p_icon; // does this make sense? doesn't this just increase the reference count instead of making a copy? Do we even need a copy?
+		copy->convert(Image::FORMAT_RGBA8);
+		copy->resize(icon_infos[i].size, icon_infos[i].size);
+
+		if (icon_infos[i].is_png) {
+			// Encode PNG icon.
+			it->create_from_image(copy);
+			String path = EditorPaths::get_singleton()->get_cache_dir().plus_file("icon.png");
+			ResourceSaver::save(path, it);
+
+			FileAccess *f = FileAccess::open(path, FileAccess::READ);
+			if (!f) {
+				// Clean up generated file.
+				DirAccess::remove_file_or_error(path);
+				ERR_FAIL();
+			}
+
+			int ofs = data.size();
+			uint64_t len = f->get_length();
+			data.resize(data.size() + len + 8);
+			f->get_buffer(&data.write[ofs + 8], len);
+			memdelete(f);
+			len += 8;
+			len = BSWAP32(len);
+			memcpy(&data.write[ofs], icon_infos[i].name, 4);
+			encode_uint32(len, &data.write[ofs + 4]);
+
+			// Clean up generated file.
+			DirAccess::remove_file_or_error(path);
+
+		} else {
+			Vector<uint8_t> src_data = copy->get_data();
+
+			//encode 24bit RGB RLE icon
+			{
+				int ofs = data.size();
+				data.resize(data.size() + 8);
+
+				_rgba8_to_packbits_encode(0, icon_infos[i].size, src_data, data); // encode R
+				_rgba8_to_packbits_encode(1, icon_infos[i].size, src_data, data); // encode G
+				_rgba8_to_packbits_encode(2, icon_infos[i].size, src_data, data); // encode B
+
+				int len = data.size() - ofs;
+				len = BSWAP32(len);
+				memcpy(&data.write[ofs], icon_infos[i].name, 4);
+				encode_uint32(len, &data.write[ofs + 4]);
+			}
+
+			//encode 8bit mask uncompressed icon
+			{
+				int ofs = data.size();
+				int len = copy->get_width() * copy->get_height();
+				data.resize(data.size() + len + 8);
+
+				for (int j = 0; j < len; j++) {
+					data.write[ofs + 8 + j] = src_data.ptr()[j * 4 + 3];
+				}
+				len += 8;
+				len = BSWAP32(len);
+				memcpy(&data.write[ofs], icon_infos[i].mask_name, 4);
+				encode_uint32(len, &data.write[ofs + 4]);
+			}
+		}
+	}
+
+	uint32_t total_len = data.size();
+	total_len = BSWAP32(total_len);
+	encode_uint32(total_len, &data.write[4]);
+
+	p_data = data;
+}
+
+void EditorExportPlatformOSX::_fix_plist(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist, const String &p_binary) {
+	String str;
+	String strnew;
+	str.parse_utf8((const char *)plist.ptr(), plist.size());
+	Vector<String> lines = str.split("\n");
+	for (int i = 0; i < lines.size(); i++) {
+		if (lines[i].find("$binary") != -1) {
+			strnew += lines[i].replace("$binary", p_binary) + "\n";
+		} else if (lines[i].find("$name") != -1) {
+			strnew += lines[i].replace("$name", p_binary) + "\n";
+		} else if (lines[i].find("$info") != -1) {
+			strnew += lines[i].replace("$info", p_preset->get("application/info")) + "\n";
+		} else if (lines[i].find("$bundle_identifier") != -1) {
+			strnew += lines[i].replace("$bundle_identifier", p_preset->get("application/bundle_identifier")) + "\n";
+		} else if (lines[i].find("$short_version") != -1) {
+			strnew += lines[i].replace("$short_version", p_preset->get("application/short_version")) + "\n";
+		} else if (lines[i].find("$version") != -1) {
+			strnew += lines[i].replace("$version", p_preset->get("application/version")) + "\n";
+		} else if (lines[i].find("$signature") != -1) {
+			strnew += lines[i].replace("$signature", p_preset->get("application/signature")) + "\n";
+		} else if (lines[i].find("$app_category") != -1) {
+			String cat = p_preset->get("application/app_category");
+			strnew += lines[i].replace("$app_category", cat.to_lower()) + "\n";
+		} else if (lines[i].find("$copyright") != -1) {
+			strnew += lines[i].replace("$copyright", p_preset->get("application/copyright")) + "\n";
+		} else if (lines[i].find("$highres") != -1) {
+			strnew += lines[i].replace("$highres", p_preset->get("display/high_res") ? "<true/>" : "<false/>") + "\n";
+		} else if (lines[i].find("$camera_usage_description") != -1) {
+			String description = p_preset->get("privacy/camera_usage_description");
+			strnew += lines[i].replace("$camera_usage_description", description) + "\n";
+		} else if (lines[i].find("$microphone_usage_description") != -1) {
+			String description = p_preset->get("privacy/microphone_usage_description");
+			strnew += lines[i].replace("$microphone_usage_description", description) + "\n";
+		} else {
+			strnew += lines[i] + "\n";
+		}
+	}
+
+	CharString cs = strnew.utf8();
+	plist.resize(cs.size() - 1);
+	for (int i = 0; i < cs.size() - 1; i++) {
+		plist.write[i] = cs[i];
+	}
+}
+
+/**
+    If we're running the OSX version of the Godot editor we'll:
+    - export our application bundle to a temporary folder
+    - attempt to code sign it
+    - and then wrap it up in a DMG
+**/
+
+Error EditorExportPlatformOSX::_notarize(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
+#ifdef OSX_ENABLED
+	List<String> args;
+
+	args.push_back("altool");
+	args.push_back("--notarize-app");
+
+	args.push_back("--primary-bundle-id");
+	args.push_back(p_preset->get("application/bundle_identifier"));
+
+	args.push_back("--username");
+	args.push_back(p_preset->get("notarization/apple_id_name"));
+
+	args.push_back("--password");
+	args.push_back(p_preset->get("notarization/apple_id_password"));
+
+	args.push_back("--type");
+	args.push_back("osx");
+
+	if (p_preset->get("notarization/apple_team_id")) {
+		args.push_back("--asc-provider");
+		args.push_back(p_preset->get("notarization/apple_team_id"));
+	}
+
+	args.push_back("--file");
+	args.push_back(p_path);
+
+	String str;
+	Error err = OS::get_singleton()->execute("xcrun", args, &str, nullptr, true);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	print_line("altool (" + p_path + "):\n" + str);
+	if (str.find("RequestUUID") == -1) {
+		EditorNode::add_io_error("altool: " + str);
+		return FAILED;
+	} else {
+		print_line("Note: The notarization process generally takes less than an hour. When the process is completed, you'll receive an email.");
+		print_line("      You can check progress manually by opening a Terminal and running the following command:");
+		print_line("      \"xcrun altool --notarization-history 0 -u <your email> -p <app-specific pwd>\"");
+	}
+
+#endif
+
+	return OK;
+}
+
+Error EditorExportPlatformOSX::_code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path, const String &p_ent_path) {
+#ifdef OSX_ENABLED
+	List<String> args;
+
+	if (p_preset->get("codesign/timestamp")) {
+		args.push_back("--timestamp");
+	}
+	if (p_preset->get("codesign/hardened_runtime")) {
+		args.push_back("--options");
+		args.push_back("runtime");
+	}
+
+	if (p_path.get_extension() != "dmg") {
+		args.push_back("--entitlements");
+		args.push_back(p_ent_path);
+	}
+
+	PackedStringArray user_args = p_preset->get("codesign/custom_options");
+	for (int i = 0; i < user_args.size(); i++) {
+		String user_arg = user_args[i].strip_edges();
+		if (!user_arg.is_empty()) {
+			args.push_back(user_arg);
+		}
+	}
+
+	args.push_back("-s");
+	if (p_preset->get("codesign/identity") == "") {
+		args.push_back("-");
+	} else {
+		args.push_back(p_preset->get("codesign/identity"));
+	}
+
+	args.push_back("-v"); /* provide some more feedback */
+
+	if (p_preset->get("codesign/replace_existing_signature")) {
+		args.push_back("-f");
+	}
+
+	args.push_back(p_path);
+
+	String str;
+	Error err = OS::get_singleton()->execute("codesign", args, &str, nullptr, true);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	print_line("codesign (" + p_path + "):\n" + str);
+	if (str.find("no identity found") != -1) {
+		EditorNode::add_io_error("codesign: no identity found");
+		return FAILED;
+	}
+	if ((str.find("unrecognized blob type") != -1) || (str.find("cannot read entitlement data") != -1)) {
+		EditorNode::add_io_error("codesign: invalid entitlements file");
+		return FAILED;
+	}
+#endif
+
+	return OK;
+}
+
+Error EditorExportPlatformOSX::_create_dmg(const String &p_dmg_path, const String &p_pkg_name, const String &p_app_path_name) {
+	List<String> args;
+
+	if (FileAccess::exists(p_dmg_path)) {
+		OS::get_singleton()->move_to_trash(p_dmg_path);
+	}
+
+	args.push_back("create");
+	args.push_back(p_dmg_path);
+	args.push_back("-volname");
+	args.push_back(p_pkg_name);
+	args.push_back("-fs");
+	args.push_back("HFS+");
+	args.push_back("-srcfolder");
+	args.push_back(p_app_path_name);
+
+	String str;
+	Error err = OS::get_singleton()->execute("hdiutil", args, &str, nullptr, true);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	print_line("hdiutil returned: " + str);
+	if (str.find("create failed") != -1) {
+		if (str.find("File exists") != -1) {
+			EditorNode::add_io_error("hdiutil: create failed - file exists");
+		} else {
+			EditorNode::add_io_error("hdiutil: create failed");
+		}
+		return FAILED;
+	}
+
+	return OK;
+}
+
+Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
+
+	String src_pkg_name;
+
+	EditorProgress ep("export", "Exporting for OSX", 3, true);
+
+	if (p_debug) {
+		src_pkg_name = p_preset->get("custom_template/debug");
+	} else {
+		src_pkg_name = p_preset->get("custom_template/release");
+	}
+
+	if (src_pkg_name == "") {
+		String err;
+		src_pkg_name = find_export_template("osx.zip", &err);
+		if (src_pkg_name == "") {
+			EditorNode::add_io_error(err);
+			return ERR_FILE_NOT_FOUND;
+		}
+	}
+
+	if (!DirAccess::exists(p_path.get_base_dir())) {
+		return ERR_FILE_BAD_PATH;
+	}
+
+	FileAccess *src_f = nullptr;
+	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
+
+	if (ep.step("Creating app", 0)) {
+		return ERR_SKIP;
+	}
+
+	unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io);
+	if (!src_pkg_zip) {
+		EditorNode::add_io_error("Could not find template app to export:\n" + src_pkg_name);
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	int ret = unzGoToFirstFile(src_pkg_zip);
+
+	String binary_to_use = "godot_osx_" + String(p_debug ? "debug" : "release") + ".64";
+
+	String pkg_name;
+	if (p_preset->get("application/name") != "") {
+		pkg_name = p_preset->get("application/name"); // app_name
+	} else if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
+		pkg_name = String(ProjectSettings::get_singleton()->get("application/config/name"));
+	} else {
+		pkg_name = "Unnamed";
+	}
+
+	pkg_name = OS::get_singleton()->get_safe_dir_name(pkg_name);
+
+	String export_format = use_dmg() && p_path.ends_with("dmg") ? "dmg" : "zip";
+
+	// Create our application bundle.
+	String tmp_app_dir_name = pkg_name + ".app";
+	String tmp_app_path_name = EditorPaths::get_singleton()->get_cache_dir().plus_file(tmp_app_dir_name);
+	print_line("Exporting to " + tmp_app_path_name);
+
+	Error err = OK;
+
+	DirAccessRef tmp_app_dir = DirAccess::create_for_path(tmp_app_path_name);
+	if (!tmp_app_dir) {
+		err = ERR_CANT_CREATE;
+	}
+
+	// Create our folder structure.
+	if (err == OK) {
+		print_line("Creating " + tmp_app_path_name + "/Contents/MacOS");
+		err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/MacOS");
+	}
+
+	if (err == OK) {
+		print_line("Creating " + tmp_app_path_name + "/Contents/Frameworks");
+		err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks");
+	}
+
+	if (err == OK) {
+		print_line("Creating " + tmp_app_path_name + "/Contents/Resources");
+		err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/Resources");
+	}
+
+	// Now process our template.
+	bool found_binary = false;
+	int total_size = 0;
+	Vector<String> dylibs_found;
+
+	while (ret == UNZ_OK && err == OK) {
+		bool is_execute = false;
+
+		// Get filename.
+		unz_file_info info;
+		char fname[16384];
+		ret = unzGetCurrentFileInfo(src_pkg_zip, &info, fname, 16384, nullptr, 0, nullptr, 0);
+
+		String file = fname;
+
+		Vector<uint8_t> data;
+		data.resize(info.uncompressed_size);
+
+		// Read.
+		unzOpenCurrentFile(src_pkg_zip);
+		unzReadCurrentFile(src_pkg_zip, data.ptrw(), data.size());
+		unzCloseCurrentFile(src_pkg_zip);
+
+		// Write.
+		file = file.replace_first("osx_template.app/", "");
+
+		if (file == "Contents/Info.plist") {
+			_fix_plist(p_preset, data, pkg_name);
+		}
+
+		if (file.begins_with("Contents/MacOS/godot_")) {
+			if (file != "Contents/MacOS/" + binary_to_use) {
+				ret = unzGoToNextFile(src_pkg_zip);
+				continue; // skip
+			}
+			found_binary = true;
+			is_execute = true;
+			file = "Contents/MacOS/" + pkg_name;
+		}
+
+		if (file == "Contents/Resources/icon.icns") {
+			// See if there is an icon.
+			String iconpath;
+			if (p_preset->get("application/icon") != "") {
+				iconpath = p_preset->get("application/icon");
+			} else {
+				iconpath = ProjectSettings::get_singleton()->get("application/config/icon");
+			}
+
+			if (iconpath != "") {
+				if (iconpath.get_extension() == "icns") {
+					FileAccess *icon = FileAccess::open(iconpath, FileAccess::READ);
+					if (icon) {
+						data.resize(icon->get_length());
+						icon->get_buffer(&data.write[0], icon->get_length());
+						icon->close();
+						memdelete(icon);
+					}
+				} else {
+					Ref<Image> icon;
+					icon.instantiate();
+					icon->load(iconpath);
+					if (!icon->is_empty()) {
+						_make_icon(icon, data);
+					}
+				}
+			}
+		}
+
+		if (data.size() > 0) {
+			if (file.find("/data.mono.osx.64.release_debug/") != -1) {
+				if (!p_debug) {
+					ret = unzGoToNextFile(src_pkg_zip);
+					continue; // skip
+				}
+				file = file.replace("/data.mono.osx.64.release_debug/", "/GodotSharp/");
+			}
+			if (file.find("/data.mono.osx.64.release/") != -1) {
+				if (p_debug) {
+					ret = unzGoToNextFile(src_pkg_zip);
+					continue; // skip
+				}
+				file = file.replace("/data.mono.osx.64.release/", "/GodotSharp/");
+			}
+
+			if (file.ends_with(".dylib")) {
+				dylibs_found.push_back(file);
+			}
+
+			print_line("ADDING: " + file + " size: " + itos(data.size()));
+			total_size += data.size();
+
+			// Write it into our application bundle.
+			file = tmp_app_path_name.plus_file(file);
+			if (err == OK) {
+				err = tmp_app_dir->make_dir_recursive(file.get_base_dir());
+			}
+			if (err == OK) {
+				FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
+				if (f) {
+					f->store_buffer(data.ptr(), data.size());
+					f->close();
+					if (is_execute) {
+						// chmod with 0755 if the file is executable.
+						FileAccess::set_unix_permissions(file, 0755);
+					}
+					memdelete(f);
+				} else {
+					err = ERR_CANT_CREATE;
+				}
+			}
+		}
+
+		ret = unzGoToNextFile(src_pkg_zip);
+	}
+
+	// We're done with our source zip.
+	unzClose(src_pkg_zip);
+
+	if (!found_binary) {
+		ERR_PRINT("Requested template binary '" + binary_to_use + "' not found. It might be missing from your template archive.");
+		err = ERR_FILE_NOT_FOUND;
+	}
+
+	if (err == OK) {
+		if (ep.step("Making PKG", 1)) {
+			return ERR_SKIP;
+		}
+
+		String pack_path = tmp_app_path_name + "/Contents/Resources/" + pkg_name + ".pck";
+		Vector<SharedObject> shared_objects;
+		err = save_pack(p_preset, pack_path, &shared_objects);
+
+		// See if we can code sign our new package.
+		bool sign_enabled = p_preset->get("codesign/enable");
+
+		String ent_path = p_preset->get("codesign/entitlements/custom_file");
+		if (sign_enabled && (ent_path == "")) {
+			ent_path = EditorPaths::get_singleton()->get_cache_dir().plus_file(pkg_name + ".entitlements");
+
+			FileAccess *ent_f = FileAccess::open(ent_path, FileAccess::WRITE);
+			if (ent_f) {
+				ent_f->store_line("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+				ent_f->store_line("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
+				ent_f->store_line("<plist version=\"1.0\">");
+				ent_f->store_line("<dict>");
+				if (Engine::get_singleton()->has_singleton("GodotSharp")) {
+					// These entitlements are required to run managed code, and are always enabled in Mono builds.
+					ent_f->store_line("<key>com.apple.security.cs.allow-jit</key>");
+					ent_f->store_line("<true/>");
+					ent_f->store_line("<key>com.apple.security.cs.allow-unsigned-executable-memory</key>");
+					ent_f->store_line("<true/>");
+					ent_f->store_line("<key>com.apple.security.cs.allow-dyld-environment-variables</key>");
+					ent_f->store_line("<true/>");
+				} else {
+					if ((bool)p_preset->get("codesign/entitlements/allow_jit_code_execution")) {
+						ent_f->store_line("<key>com.apple.security.cs.allow-jit</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((bool)p_preset->get("codesign/entitlements/allow_unsigned_executable_memory")) {
+						ent_f->store_line("<key>com.apple.security.cs.allow-unsigned-executable-memory</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((bool)p_preset->get("codesign/entitlements/allow_dyld_environment_variables")) {
+						ent_f->store_line("<key>com.apple.security.cs.allow-dyld-environment-variables</key>");
+						ent_f->store_line("<true/>");
+					}
+				}
+
+				if ((bool)p_preset->get("codesign/entitlements/disable_library_validation")) {
+					ent_f->store_line("<key>com.apple.security.cs.disable-library-validation</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/audio_input")) {
+					ent_f->store_line("<key>com.apple.security.device.audio-input</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/camera")) {
+					ent_f->store_line("<key>com.apple.security.device.camera</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/location")) {
+					ent_f->store_line("<key>com.apple.security.personal-information.location</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/address_book")) {
+					ent_f->store_line("<key>com.apple.security.personal-information.addressbook</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/calendars")) {
+					ent_f->store_line("<key>com.apple.security.personal-information.calendars</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/photos_library")) {
+					ent_f->store_line("<key>com.apple.security.personal-information.photos-library</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/apple_events")) {
+					ent_f->store_line("<key>com.apple.security.automation.apple-events</key>");
+					ent_f->store_line("<true/>");
+				}
+				if ((bool)p_preset->get("codesign/entitlements/debugging")) {
+					ent_f->store_line("<key>com.apple.security.get-task-allow</key>");
+					ent_f->store_line("<true/>");
+				}
+
+				if ((bool)p_preset->get("codesign/entitlements/app_sandbox/enabled")) {
+					ent_f->store_line("<key>com.apple.security.app-sandbox</key>");
+					ent_f->store_line("<true/>");
+
+					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/network_server")) {
+						ent_f->store_line("<key>com.apple.security.network.server</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/network_client")) {
+						ent_f->store_line("<key>com.apple.security.network.client</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/device_usb")) {
+						ent_f->store_line("<key>com.apple.security.device.usb</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((bool)p_preset->get("codesign/entitlements/app_sandbox/device_bluetooth")) {
+						ent_f->store_line("<key>com.apple.security.device.bluetooth</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_downloads") == 1) {
+						ent_f->store_line("<key>com.apple.security.files.downloads.read-only</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_downloads") == 2) {
+						ent_f->store_line("<key>com.apple.security.files.downloads.read-write</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_pictures") == 1) {
+						ent_f->store_line("<key>com.apple.security.files.pictures.read-only</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_pictures") == 2) {
+						ent_f->store_line("<key>com.apple.security.files.pictures.read-write</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_music") == 1) {
+						ent_f->store_line("<key>com.apple.security.files.music.read-only</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_music") == 2) {
+						ent_f->store_line("<key>com.apple.security.files.music.read-write</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_movies") == 1) {
+						ent_f->store_line("<key>com.apple.security.files.movies.read-only</key>");
+						ent_f->store_line("<true/>");
+					}
+					if ((int)p_preset->get("codesign/entitlements/app_sandbox/files_movies") == 2) {
+						ent_f->store_line("<key>com.apple.security.files.movies.read-write</key>");
+						ent_f->store_line("<true/>");
+					}
+				}
+
+				ent_f->store_line("</dict>");
+				ent_f->store_line("</plist>");
+
+				ent_f->close();
+				memdelete(ent_f);
+			} else {
+				err = ERR_CANT_CREATE;
+			}
+		}
+
+		if (err == OK) {
+			DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+			for (int i = 0; i < shared_objects.size(); i++) {
+				String src_path = ProjectSettings::get_singleton()->globalize_path(shared_objects[i].path);
+				if (da->dir_exists(src_path)) {
+#ifndef UNIX_ENABLED
+					WARN_PRINT("Relative symlinks are not supported, exported " + src_path.get_file() + " might be broken!");
+#endif
+					print_verbose("export framework: " + src_path + " -> " + tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
+					err = da->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
+					if (err == OK) {
+						err = da->copy_dir(src_path, tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file(), -1, true);
+					}
+				} else {
+					print_verbose("export dylib: " + src_path + " -> " + tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
+					err = da->copy(src_path, tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file());
+				}
+				if (err == OK && sign_enabled) {
+					err = _code_sign(p_preset, tmp_app_path_name + "/Contents/Frameworks/" + src_path.get_file(), ent_path);
+				}
+			}
+			memdelete(da);
+		}
+
+		if (sign_enabled) {
+			for (int i = 0; i < dylibs_found.size(); i++) {
+				if (err == OK) {
+					err = _code_sign(p_preset, tmp_app_path_name + "/" + dylibs_found[i], ent_path);
+				}
+			}
+		}
+
+		if (err == OK && sign_enabled) {
+			if (ep.step("Code signing bundle", 2)) {
+				return ERR_SKIP;
+			}
+			err = _code_sign(p_preset, tmp_app_path_name + "/Contents/MacOS/" + pkg_name, ent_path);
+		}
+
+		if (export_format == "dmg") {
+			// Create a DMG.
+			if (err == OK) {
+				if (ep.step("Making DMG", 3)) {
+					return ERR_SKIP;
+				}
+				err = _create_dmg(p_path, pkg_name, tmp_app_path_name);
+			}
+			// Sign DMG.
+			if (err == OK && sign_enabled) {
+				if (ep.step("Code signing DMG", 3)) {
+					return ERR_SKIP;
+				}
+				err = _code_sign(p_preset, p_path, ent_path);
+			}
+		} else {
+			// Create ZIP.
+			if (err == OK) {
+				if (ep.step("Making ZIP", 3)) {
+					return ERR_SKIP;
+				}
+				if (FileAccess::exists(p_path)) {
+					OS::get_singleton()->move_to_trash(p_path);
+				}
+
+				FileAccess *dst_f = nullptr;
+				zlib_filefunc_def io_dst = zipio_create_io_from_file(&dst_f);
+				zipFile zip = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io_dst);
+
+				_zip_folder_recursive(zip, EditorPaths::get_singleton()->get_cache_dir(), pkg_name + ".app", pkg_name);
+
+				zipClose(zip, nullptr);
+			}
+		}
+
+		bool noto_enabled = p_preset->get("notarization/enable");
+		if (err == OK && noto_enabled) {
+			if (ep.step("Sending archive for notarization", 4)) {
+				return ERR_SKIP;
+			}
+			err = _notarize(p_preset, p_path);
+		}
+
+		// Clean up temporary .app dir.
+		tmp_app_dir->change_dir(tmp_app_path_name);
+		tmp_app_dir->erase_contents_recursive();
+		tmp_app_dir->change_dir("..");
+		tmp_app_dir->remove(tmp_app_dir_name);
+	}
+
+	return err;
+}
+
+void EditorExportPlatformOSX::_zip_folder_recursive(zipFile &p_zip, const String &p_root_path, const String &p_folder, const String &p_pkg_name) {
+	String dir = p_root_path.plus_file(p_folder);
+
+	DirAccess *da = DirAccess::open(dir);
+	da->list_dir_begin();
+	String f;
+	while ((f = da->get_next()) != "") {
+		if (f == "." || f == "..") {
+			continue;
+		}
+		if (da->is_link(f)) {
+			OS::Time time = OS::get_singleton()->get_time();
+			OS::Date date = OS::get_singleton()->get_date();
+
+			zip_fileinfo zipfi;
+			zipfi.tmz_date.tm_hour = time.hour;
+			zipfi.tmz_date.tm_mday = date.day;
+			zipfi.tmz_date.tm_min = time.minute;
+			zipfi.tmz_date.tm_mon = date.month - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, http://www.cplusplus.com/reference/ctime/tm/
+			zipfi.tmz_date.tm_sec = time.second;
+			zipfi.tmz_date.tm_year = date.year;
+			zipfi.dosDate = 0;
+			// 0120000: symbolic link type
+			// 0000755: permissions rwxr-xr-x
+			// 0000644: permissions rw-r--r--
+			uint32_t _mode = 0120644;
+			zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
+			zipfi.internal_fa = 0;
+
+			zipOpenNewFileInZip4(p_zip,
+					p_folder.plus_file(f).utf8().get_data(),
+					&zipfi,
+					nullptr,
+					0,
+					nullptr,
+					0,
+					nullptr,
+					Z_DEFLATED,
+					Z_DEFAULT_COMPRESSION,
+					0,
+					-MAX_WBITS,
+					DEF_MEM_LEVEL,
+					Z_DEFAULT_STRATEGY,
+					nullptr,
+					0,
+					0x0314, // "version made by", 0x03 - Unix, 0x14 - ZIP specification version 2.0, required to store Unix file permissions
+					0);
+
+			String target = da->read_link(f);
+			zipWriteInFileInZip(p_zip, target.utf8().get_data(), target.utf8().size());
+			zipCloseFileInZip(p_zip);
+		} else if (da->current_is_dir()) {
+			_zip_folder_recursive(p_zip, p_root_path, p_folder.plus_file(f), p_pkg_name);
+		} else {
+			bool is_executable = (p_folder.ends_with("MacOS") && (f == p_pkg_name));
+
+			OS::Time time = OS::get_singleton()->get_time();
+			OS::Date date = OS::get_singleton()->get_date();
+
+			zip_fileinfo zipfi;
+			zipfi.tmz_date.tm_hour = time.hour;
+			zipfi.tmz_date.tm_mday = date.day;
+			zipfi.tmz_date.tm_min = time.minute;
+			zipfi.tmz_date.tm_mon = date.month - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, http://www.cplusplus.com/reference/ctime/tm/
+			zipfi.tmz_date.tm_sec = time.second;
+			zipfi.tmz_date.tm_year = date.year;
+			zipfi.dosDate = 0;
+			// 0100000: regular file type
+			// 0000755: permissions rwxr-xr-x
+			// 0000644: permissions rw-r--r--
+			uint32_t _mode = (is_executable ? 0100755 : 0100644);
+			zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
+			zipfi.internal_fa = 0;
+
+			zipOpenNewFileInZip4(p_zip,
+					p_folder.plus_file(f).utf8().get_data(),
+					&zipfi,
+					nullptr,
+					0,
+					nullptr,
+					0,
+					nullptr,
+					Z_DEFLATED,
+					Z_DEFAULT_COMPRESSION,
+					0,
+					-MAX_WBITS,
+					DEF_MEM_LEVEL,
+					Z_DEFAULT_STRATEGY,
+					nullptr,
+					0,
+					0x0314, // "version made by", 0x03 - Unix, 0x14 - ZIP specification version 2.0, required to store Unix file permissions
+					0);
+
+			Vector<uint8_t> array = FileAccess::get_file_as_array(dir.plus_file(f));
+			zipWriteInFileInZip(p_zip, array.ptr(), array.size());
+			zipCloseFileInZip(p_zip);
+		}
+	}
+	da->list_dir_end();
+	memdelete(da);
+}
+
+bool EditorExportPlatformOSX::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+	String err;
+	bool valid = false;
+
+	// Look for export templates (first official, and if defined custom templates).
+
+	bool dvalid = exists_export_template("osx.zip", &err);
+	bool rvalid = dvalid; // Both in the same ZIP.
+
+	if (p_preset->get("custom_template/debug") != "") {
+		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
+		if (!dvalid) {
+			err += TTR("Custom debug template not found.") + "\n";
+		}
+	}
+	if (p_preset->get("custom_template/release") != "") {
+		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
+		if (!rvalid) {
+			err += TTR("Custom release template not found.") + "\n";
+		}
+	}
+
+	valid = dvalid || rvalid;
+	r_missing_templates = !valid;
+
+	String identifier = p_preset->get("application/bundle_identifier");
+	String pn_err;
+	if (!is_package_name_valid(identifier, &pn_err)) {
+		err += TTR("Invalid bundle identifier:") + " " + pn_err + "\n";
+		valid = false;
+	}
+
+	bool sign_enabled = p_preset->get("codesign/enable");
+	bool noto_enabled = p_preset->get("notarization/enable");
+	if (noto_enabled) {
+		if (!sign_enabled) {
+			err += TTR("Notarization: code signing required.") + "\n";
+			valid = false;
+		}
+		bool hr_enabled = p_preset->get("codesign/hardened_runtime");
+		if (!hr_enabled) {
+			err += TTR("Notarization: hardened runtime required.") + "\n";
+			valid = false;
+		}
+		if (p_preset->get("notarization/apple_id_name") == "") {
+			err += TTR("Notarization: Apple ID name not specified.") + "\n";
+			valid = false;
+		}
+		if (p_preset->get("notarization/apple_id_password") == "") {
+			err += TTR("Notarization: Apple ID password not specified.") + "\n";
+			valid = false;
+		}
+	}
+
+	if (!err.is_empty()) {
+		r_error = err;
+	}
+	return valid;
+}
+
+EditorExportPlatformOSX::EditorExportPlatformOSX() {
+	Ref<Image> img = memnew(Image(_osx_logo));
+	logo.instantiate();
+	logo->create_from_image(img);
+}
+
+EditorExportPlatformOSX::~EditorExportPlatformOSX() {
+}
diff --git a/platform/osx/export/export_plugin.h b/platform/osx/export/export_plugin.h
new file mode 100644
index 0000000000..cd85ce2aad
--- /dev/null
+++ b/platform/osx/export/export_plugin.h
@@ -0,0 +1,128 @@
+/*************************************************************************/
+/*  export_plugin.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef OSX_EXPORT_PLUGIN_H
+#define OSX_EXPORT_PLUGIN_H
+
+#include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/marshalls.h"
+#include "core/io/resource_saver.h"
+#include "core/io/zip_io.h"
+#include "core/os/os.h"
+#include "core/version.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "platform/osx/logo.gen.h"
+
+#include <sys/stat.h>
+
+class EditorExportPlatformOSX : public EditorExportPlatform {
+	GDCLASS(EditorExportPlatformOSX, EditorExportPlatform);
+
+	int version_code = 0;
+
+	Ref<ImageTexture> logo;
+
+	void _fix_plist(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist, const String &p_binary);
+	void _make_icon(const Ref<Image> &p_icon, Vector<uint8_t> &p_data);
+
+	Error _notarize(const Ref<EditorExportPreset> &p_preset, const String &p_path);
+	Error _code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path, const String &p_ent_path);
+	Error _create_dmg(const String &p_dmg_path, const String &p_pkg_name, const String &p_app_path_name);
+	void _zip_folder_recursive(zipFile &p_zip, const String &p_root_path, const String &p_folder, const String &p_pkg_name);
+
+#ifdef OSX_ENABLED
+	bool use_codesign() const { return true; }
+	bool use_dmg() const { return true; }
+#else
+	bool use_codesign() const { return false; }
+	bool use_dmg() const { return false; }
+#endif
+	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const {
+		String pname = p_package;
+
+		if (pname.length() == 0) {
+			if (r_error) {
+				*r_error = TTR("Identifier is missing.");
+			}
+			return false;
+		}
+
+		for (int i = 0; i < pname.length(); i++) {
+			char32_t c = pname[i];
+			if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) {
+				if (r_error) {
+					*r_error = vformat(TTR("The character '%s' is not allowed in Identifier."), String::chr(c));
+				}
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+protected:
+	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
+	virtual void get_export_options(List<ExportOption> *r_options) override;
+
+public:
+	virtual String get_name() const override { return "macOS"; }
+	virtual String get_os_name() const override { return "macOS"; }
+	virtual Ref<Texture2D> get_logo() const override { return logo; }
+
+	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override {
+		List<String> list;
+		if (use_dmg()) {
+			list.push_back("dmg");
+		}
+		list.push_back("zip");
+		return list;
+	}
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
+
+	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+
+	virtual void get_platform_features(List<String> *r_features) override {
+		r_features->push_back("pc");
+		r_features->push_back("s3tc");
+		r_features->push_back("macOS");
+	}
+
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
+	}
+
+	EditorExportPlatformOSX();
+	~EditorExportPlatformOSX();
+};
+
+#endif
diff --git a/platform/uwp/export/app_packager.cpp b/platform/uwp/export/app_packager.cpp
new file mode 100644
index 0000000000..39a2693f75
--- /dev/null
+++ b/platform/uwp/export/app_packager.cpp
@@ -0,0 +1,474 @@
+/*************************************************************************/
+/*  app_packager.cpp                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "app_packager.h"
+
+String AppxPackager::hash_block(const uint8_t *p_block_data, size_t p_block_len) {
+	unsigned char hash[32];
+	char base64[45];
+
+	CryptoCore::sha256(p_block_data, p_block_len, hash);
+	size_t len = 0;
+	CryptoCore::b64_encode((unsigned char *)base64, 45, &len, (unsigned char *)hash, 32);
+	base64[44] = '\0';
+
+	return String(base64);
+}
+
+void AppxPackager::make_block_map(const String &p_path) {
+	FileAccess *tmp_file = FileAccess::open(p_path, FileAccess::WRITE);
+
+	tmp_file->store_string("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>");
+	tmp_file->store_string("<BlockMap xmlns=\"http://schemas.microsoft.com/appx/2010/blockmap\" HashMethod=\"http://www.w3.org/2001/04/xmlenc#sha256\">");
+
+	for (int i = 0; i < file_metadata.size(); i++) {
+		FileMeta file = file_metadata[i];
+
+		tmp_file->store_string(
+				"<File Name=\"" + file.name.replace("/", "\\") + "\" Size=\"" + itos(file.uncompressed_size) + "\" LfhSize=\"" + itos(file.lfh_size) + "\">");
+
+		for (int j = 0; j < file.hashes.size(); j++) {
+			tmp_file->store_string("<Block Hash=\"" + file.hashes[j].base64_hash + "\" ");
+			if (file.compressed) {
+				tmp_file->store_string("Size=\"" + itos(file.hashes[j].compressed_size) + "\" ");
+			}
+			tmp_file->store_string("/>");
+		}
+
+		tmp_file->store_string("</File>");
+	}
+
+	tmp_file->store_string("</BlockMap>");
+
+	tmp_file->close();
+	memdelete(tmp_file);
+}
+
+String AppxPackager::content_type(String p_extension) {
+	if (p_extension == "png") {
+		return "image/png";
+	} else if (p_extension == "jpg") {
+		return "image/jpg";
+	} else if (p_extension == "xml") {
+		return "application/xml";
+	} else if (p_extension == "exe" || p_extension == "dll") {
+		return "application/x-msdownload";
+	} else {
+		return "application/octet-stream";
+	}
+}
+
+void AppxPackager::make_content_types(const String &p_path) {
+	FileAccess *tmp_file = FileAccess::open(p_path, FileAccess::WRITE);
+
+	tmp_file->store_string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+	tmp_file->store_string("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">");
+
+	Map<String, String> types;
+
+	for (int i = 0; i < file_metadata.size(); i++) {
+		String ext = file_metadata[i].name.get_extension().to_lower();
+
+		if (types.has(ext)) {
+			continue;
+		}
+
+		types[ext] = content_type(ext);
+
+		tmp_file->store_string("<Default Extension=\"" + ext + "\" ContentType=\"" + types[ext] + "\" />");
+	}
+
+	// Appx signature file
+	tmp_file->store_string("<Default Extension=\"p7x\" ContentType=\"application/octet-stream\" />");
+
+	// Override for package files
+	tmp_file->store_string("<Override PartName=\"/AppxManifest.xml\" ContentType=\"application/vnd.ms-appx.manifest+xml\" />");
+	tmp_file->store_string("<Override PartName=\"/AppxBlockMap.xml\" ContentType=\"application/vnd.ms-appx.blockmap+xml\" />");
+	tmp_file->store_string("<Override PartName=\"/AppxSignature.p7x\" ContentType=\"application/vnd.ms-appx.signature\" />");
+	tmp_file->store_string("<Override PartName=\"/AppxMetadata/CodeIntegrity.cat\" ContentType=\"application/vnd.ms-pkiseccat\" />");
+
+	tmp_file->store_string("</Types>");
+
+	tmp_file->close();
+	memdelete(tmp_file);
+}
+
+Vector<uint8_t> AppxPackager::make_file_header(FileMeta p_file_meta) {
+	Vector<uint8_t> buf;
+	buf.resize(BASE_FILE_HEADER_SIZE + p_file_meta.name.length());
+
+	int offs = 0;
+	// Write magic
+	offs += buf_put_int32(FILE_HEADER_MAGIC, &buf.write[offs]);
+
+	// Version
+	offs += buf_put_int16(ZIP_VERSION, &buf.write[offs]);
+
+	// Special flag
+	offs += buf_put_int16(GENERAL_PURPOSE, &buf.write[offs]);
+
+	// Compression
+	offs += buf_put_int16(p_file_meta.compressed ? Z_DEFLATED : 0, &buf.write[offs]);
+
+	// File date and time
+	offs += buf_put_int32(0, &buf.write[offs]);
+
+	// CRC-32
+	offs += buf_put_int32(p_file_meta.file_crc32, &buf.write[offs]);
+
+	// Compressed size
+	offs += buf_put_int32(p_file_meta.compressed_size, &buf.write[offs]);
+
+	// Uncompressed size
+	offs += buf_put_int32(p_file_meta.uncompressed_size, &buf.write[offs]);
+
+	// File name length
+	offs += buf_put_int16(p_file_meta.name.length(), &buf.write[offs]);
+
+	// Extra data length
+	offs += buf_put_int16(0, &buf.write[offs]);
+
+	// File name
+	offs += buf_put_string(p_file_meta.name, &buf.write[offs]);
+
+	// Done!
+	return buf;
+}
+
+void AppxPackager::store_central_dir_header(const FileMeta &p_file, bool p_do_hash) {
+	Vector<uint8_t> &buf = central_dir_data;
+	int offs = buf.size();
+	buf.resize(buf.size() + BASE_CENTRAL_DIR_SIZE + p_file.name.length());
+
+	// Write magic
+	offs += buf_put_int32(CENTRAL_DIR_MAGIC, &buf.write[offs]);
+
+	// ZIP versions
+	offs += buf_put_int16(ZIP_ARCHIVE_VERSION, &buf.write[offs]);
+	offs += buf_put_int16(ZIP_VERSION, &buf.write[offs]);
+
+	// General purpose flag
+	offs += buf_put_int16(GENERAL_PURPOSE, &buf.write[offs]);
+
+	// Compression
+	offs += buf_put_int16(p_file.compressed ? Z_DEFLATED : 0, &buf.write[offs]);
+
+	// Modification date/time
+	offs += buf_put_int32(0, &buf.write[offs]);
+
+	// Crc-32
+	offs += buf_put_int32(p_file.file_crc32, &buf.write[offs]);
+
+	// File sizes
+	offs += buf_put_int32(p_file.compressed_size, &buf.write[offs]);
+	offs += buf_put_int32(p_file.uncompressed_size, &buf.write[offs]);
+
+	// File name length
+	offs += buf_put_int16(p_file.name.length(), &buf.write[offs]);
+
+	// Extra field length
+	offs += buf_put_int16(0, &buf.write[offs]);
+
+	// Comment length
+	offs += buf_put_int16(0, &buf.write[offs]);
+
+	// Disk number start, internal/external file attributes
+	for (int i = 0; i < 8; i++) {
+		buf.write[offs++] = 0;
+	}
+
+	// Relative offset
+	offs += buf_put_int32(p_file.zip_offset, &buf.write[offs]);
+
+	// File name
+	offs += buf_put_string(p_file.name, &buf.write[offs]);
+
+	// Done!
+}
+
+Vector<uint8_t> AppxPackager::make_end_of_central_record() {
+	Vector<uint8_t> buf;
+	buf.resize(ZIP64_END_OF_CENTRAL_DIR_SIZE + 12 + END_OF_CENTRAL_DIR_SIZE); // Size plus magic
+
+	int offs = 0;
+
+	// Write magic
+	offs += buf_put_int32(ZIP64_END_OF_CENTRAL_DIR_MAGIC, &buf.write[offs]);
+
+	// Size of this record
+	offs += buf_put_int64(ZIP64_END_OF_CENTRAL_DIR_SIZE, &buf.write[offs]);
+
+	// Version (yes, twice)
+	offs += buf_put_int16(ZIP_ARCHIVE_VERSION, &buf.write[offs]);
+	offs += buf_put_int16(ZIP_ARCHIVE_VERSION, &buf.write[offs]);
+
+	// Disk number
+	for (int i = 0; i < 8; i++) {
+		buf.write[offs++] = 0;
+	}
+
+	// Number of entries (total and per disk)
+	offs += buf_put_int64(file_metadata.size(), &buf.write[offs]);
+	offs += buf_put_int64(file_metadata.size(), &buf.write[offs]);
+
+	// Size of central dir
+	offs += buf_put_int64(central_dir_data.size(), &buf.write[offs]);
+
+	// Central dir offset
+	offs += buf_put_int64(central_dir_offset, &buf.write[offs]);
+
+	////// ZIP64 locator
+
+	// Write magic for zip64 central dir locator
+	offs += buf_put_int32(ZIP64_END_DIR_LOCATOR_MAGIC, &buf.write[offs]);
+
+	// Disk number
+	for (int i = 0; i < 4; i++) {
+		buf.write[offs++] = 0;
+	}
+
+	// Relative offset
+	offs += buf_put_int64(end_of_central_dir_offset, &buf.write[offs]);
+
+	// Number of disks
+	offs += buf_put_int32(1, &buf.write[offs]);
+
+	/////// End of zip directory
+
+	// Write magic for end central dir
+	offs += buf_put_int32(END_OF_CENTRAL_DIR_MAGIC, &buf.write[offs]);
+
+	// Dummy stuff for Zip64
+	for (int i = 0; i < 4; i++) {
+		buf.write[offs++] = 0x0;
+	}
+	for (int i = 0; i < 12; i++) {
+		buf.write[offs++] = 0xFF;
+	}
+
+	// Size of comments
+	for (int i = 0; i < 2; i++) {
+		buf.write[offs++] = 0;
+	}
+
+	// Done!
+	return buf;
+}
+
+void AppxPackager::init(FileAccess *p_fa) {
+	package = p_fa;
+	central_dir_offset = 0;
+	end_of_central_dir_offset = 0;
+}
+
+Error AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t p_len, int p_file_no, int p_total_files, bool p_compress) {
+	if (p_file_no >= 1 && p_total_files >= 1) {
+		if (EditorNode::progress_task_step(progress_task, "File: " + p_file_name, (p_file_no * 100) / p_total_files)) {
+			return ERR_SKIP;
+		}
+	}
+
+	FileMeta meta;
+	meta.name = p_file_name;
+	meta.uncompressed_size = p_len;
+	meta.compressed_size = p_len;
+	meta.compressed = p_compress;
+	meta.zip_offset = package->get_position();
+
+	Vector<uint8_t> file_buffer;
+
+	// Data for compression
+	z_stream strm;
+	FileAccess *strm_f = nullptr;
+	Vector<uint8_t> strm_in;
+	strm_in.resize(BLOCK_SIZE);
+	Vector<uint8_t> strm_out;
+
+	if (p_compress) {
+		strm.zalloc = zipio_alloc;
+		strm.zfree = zipio_free;
+		strm.opaque = &strm_f;
+
+		strm_out.resize(BLOCK_SIZE + 8);
+
+		deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
+	}
+
+	int step = 0;
+
+	while (p_len - step > 0) {
+		size_t block_size = (p_len - step) > BLOCK_SIZE ? (size_t)BLOCK_SIZE : (p_len - step);
+
+		for (uint64_t i = 0; i < block_size; i++) {
+			strm_in.write[i] = p_buffer[step + i];
+		}
+
+		BlockHash bh;
+		bh.base64_hash = hash_block(strm_in.ptr(), block_size);
+
+		if (p_compress) {
+			strm.avail_in = block_size;
+			strm.avail_out = strm_out.size();
+			strm.next_in = (uint8_t *)strm_in.ptr();
+			strm.next_out = strm_out.ptrw();
+
+			int total_out_before = strm.total_out;
+
+			int err = deflate(&strm, Z_FULL_FLUSH);
+			ERR_FAIL_COND_V(err < 0, ERR_BUG); // Negative means bug
+
+			bh.compressed_size = strm.total_out - total_out_before;
+
+			//package->store_buffer(strm_out.ptr(), strm.total_out - total_out_before);
+			int start = file_buffer.size();
+			file_buffer.resize(file_buffer.size() + bh.compressed_size);
+			for (uint64_t i = 0; i < bh.compressed_size; i++) {
+				file_buffer.write[start + i] = strm_out[i];
+			}
+		} else {
+			bh.compressed_size = block_size;
+			//package->store_buffer(strm_in.ptr(), block_size);
+			int start = file_buffer.size();
+			file_buffer.resize(file_buffer.size() + block_size);
+			for (uint64_t i = 0; i < bh.compressed_size; i++) {
+				file_buffer.write[start + i] = strm_in[i];
+			}
+		}
+
+		meta.hashes.push_back(bh);
+
+		step += block_size;
+	}
+
+	if (p_compress) {
+		strm.avail_in = 0;
+		strm.avail_out = strm_out.size();
+		strm.next_in = (uint8_t *)strm_in.ptr();
+		strm.next_out = strm_out.ptrw();
+
+		int total_out_before = strm.total_out;
+
+		deflate(&strm, Z_FINISH);
+
+		//package->store_buffer(strm_out.ptr(), strm.total_out - total_out_before);
+		int start = file_buffer.size();
+		file_buffer.resize(file_buffer.size() + (strm.total_out - total_out_before));
+		for (uint64_t i = 0; i < (strm.total_out - total_out_before); i++) {
+			file_buffer.write[start + i] = strm_out[i];
+		}
+
+		deflateEnd(&strm);
+		meta.compressed_size = strm.total_out;
+
+	} else {
+		meta.compressed_size = p_len;
+	}
+
+	// Calculate file CRC-32
+	uLong crc = crc32(0L, Z_NULL, 0);
+	crc = crc32(crc, p_buffer, p_len);
+	meta.file_crc32 = crc;
+
+	// Create file header
+	Vector<uint8_t> file_header = make_file_header(meta);
+	meta.lfh_size = file_header.size();
+
+	// Store the header and file;
+	package->store_buffer(file_header.ptr(), file_header.size());
+	package->store_buffer(file_buffer.ptr(), file_buffer.size());
+
+	file_metadata.push_back(meta);
+
+	return OK;
+}
+
+void AppxPackager::finish() {
+	// Create and add block map file
+	EditorNode::progress_task_step("export", "Creating block map...", 4);
+
+	const String &tmp_blockmap_file_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpblockmap.xml");
+	make_block_map(tmp_blockmap_file_path);
+
+	FileAccess *blockmap_file = FileAccess::open(tmp_blockmap_file_path, FileAccess::READ);
+	Vector<uint8_t> blockmap_buffer;
+	blockmap_buffer.resize(blockmap_file->get_length());
+
+	blockmap_file->get_buffer(blockmap_buffer.ptrw(), blockmap_buffer.size());
+
+	add_file("AppxBlockMap.xml", blockmap_buffer.ptr(), blockmap_buffer.size(), -1, -1, true);
+
+	blockmap_file->close();
+	memdelete(blockmap_file);
+
+	// Add content types
+
+	EditorNode::progress_task_step("export", "Setting content types...", 5);
+
+	const String &tmp_content_types_file_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpcontenttypes.xml");
+	make_content_types(tmp_content_types_file_path);
+
+	FileAccess *types_file = FileAccess::open(tmp_content_types_file_path, FileAccess::READ);
+	Vector<uint8_t> types_buffer;
+	types_buffer.resize(types_file->get_length());
+
+	types_file->get_buffer(types_buffer.ptrw(), types_buffer.size());
+
+	add_file("[Content_Types].xml", types_buffer.ptr(), types_buffer.size(), -1, -1, true);
+
+	types_file->close();
+	memdelete(types_file);
+
+	// Cleanup generated files.
+	DirAccess::remove_file_or_error(tmp_blockmap_file_path);
+	DirAccess::remove_file_or_error(tmp_content_types_file_path);
+
+	// Pre-process central directory before signing
+	for (int i = 0; i < file_metadata.size(); i++) {
+		store_central_dir_header(file_metadata[i]);
+	}
+
+	// Write central directory
+	EditorNode::progress_task_step("export", "Finishing package...", 6);
+	central_dir_offset = package->get_position();
+	package->store_buffer(central_dir_data.ptr(), central_dir_data.size());
+
+	// End record
+	end_of_central_dir_offset = package->get_position();
+	Vector<uint8_t> end_record = make_end_of_central_record();
+	package->store_buffer(end_record.ptr(), end_record.size());
+
+	package->close();
+	memdelete(package);
+	package = nullptr;
+}
+
+AppxPackager::AppxPackager() {}
+
+AppxPackager::~AppxPackager() {}
diff --git a/platform/uwp/export/app_packager.h b/platform/uwp/export/app_packager.h
new file mode 100644
index 0000000000..0eb1a78df1
--- /dev/null
+++ b/platform/uwp/export/app_packager.h
@@ -0,0 +1,150 @@
+/*************************************************************************/
+/*  app_packager.h                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef UWP_APP_PACKAGER_H
+#define UWP_APP_PACKAGER_H
+
+#include "core/config/project_settings.h"
+#include "core/core_bind.h"
+#include "core/crypto/crypto_core.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/marshalls.h"
+#include "core/io/zip_io.h"
+#include "core/object/class_db.h"
+#include "core/version.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+
+#include "thirdparty/minizip/unzip.h"
+#include "thirdparty/minizip/zip.h"
+
+#include <zlib.h>
+
+class AppxPackager {
+	enum {
+		FILE_HEADER_MAGIC = 0x04034b50,
+		DATA_DESCRIPTOR_MAGIC = 0x08074b50,
+		CENTRAL_DIR_MAGIC = 0x02014b50,
+		END_OF_CENTRAL_DIR_MAGIC = 0x06054b50,
+		ZIP64_END_OF_CENTRAL_DIR_MAGIC = 0x06064b50,
+		ZIP64_END_DIR_LOCATOR_MAGIC = 0x07064b50,
+		P7X_SIGNATURE = 0x58434b50,
+		ZIP64_HEADER_ID = 0x0001,
+		ZIP_VERSION = 20,
+		ZIP_ARCHIVE_VERSION = 45,
+		GENERAL_PURPOSE = 0x00,
+		BASE_FILE_HEADER_SIZE = 30,
+		DATA_DESCRIPTOR_SIZE = 24,
+		BASE_CENTRAL_DIR_SIZE = 46,
+		EXTRA_FIELD_LENGTH = 28,
+		ZIP64_HEADER_SIZE = 24,
+		ZIP64_END_OF_CENTRAL_DIR_SIZE = (56 - 12),
+		END_OF_CENTRAL_DIR_SIZE = 42,
+		BLOCK_SIZE = 65536,
+	};
+
+	struct BlockHash {
+		String base64_hash;
+		size_t compressed_size = 0;
+	};
+
+	struct FileMeta {
+		String name;
+		int lfh_size = 0;
+		bool compressed = false;
+		size_t compressed_size = 0;
+		size_t uncompressed_size = 0;
+		Vector<BlockHash> hashes;
+		uLong file_crc32 = 0;
+		ZPOS64_T zip_offset = 0;
+	};
+
+	String progress_task;
+	FileAccess *package = nullptr;
+
+	Set<String> mime_types;
+
+	Vector<FileMeta> file_metadata;
+
+	ZPOS64_T central_dir_offset;
+	ZPOS64_T end_of_central_dir_offset;
+	Vector<uint8_t> central_dir_data;
+
+	String hash_block(const uint8_t *p_block_data, size_t p_block_len);
+
+	void make_block_map(const String &p_path);
+	void make_content_types(const String &p_path);
+
+	_FORCE_INLINE_ unsigned int buf_put_int16(uint16_t p_val, uint8_t *p_buf) {
+		for (int i = 0; i < 2; i++) {
+			*p_buf++ = (p_val >> (i * 8)) & 0xFF;
+		}
+		return 2;
+	}
+
+	_FORCE_INLINE_ unsigned int buf_put_int32(uint32_t p_val, uint8_t *p_buf) {
+		for (int i = 0; i < 4; i++) {
+			*p_buf++ = (p_val >> (i * 8)) & 0xFF;
+		}
+		return 4;
+	}
+
+	_FORCE_INLINE_ unsigned int buf_put_int64(uint64_t p_val, uint8_t *p_buf) {
+		for (int i = 0; i < 8; i++) {
+			*p_buf++ = (p_val >> (i * 8)) & 0xFF;
+		}
+		return 8;
+	}
+
+	_FORCE_INLINE_ unsigned int buf_put_string(String p_val, uint8_t *p_buf) {
+		for (int i = 0; i < p_val.length(); i++) {
+			*p_buf++ = p_val.utf8().get(i);
+		}
+		return p_val.length();
+	}
+
+	Vector<uint8_t> make_file_header(FileMeta p_file_meta);
+	void store_central_dir_header(const FileMeta &p_file, bool p_do_hash = true);
+	Vector<uint8_t> make_end_of_central_record();
+
+	String content_type(String p_extension);
+
+public:
+	void set_progress_task(String p_task) { progress_task = p_task; }
+	void init(FileAccess *p_fa);
+	Error add_file(String p_file_name, const uint8_t *p_buffer, size_t p_len, int p_file_no, int p_total_files, bool p_compress = false);
+	void finish();
+
+	AppxPackager();
+	~AppxPackager();
+};
+
+#endif
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index 98925fd7fa..f5c3db33bb 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -30,1408 +30,7 @@
 
 #include "export.h"
 
-#include "core/config/project_settings.h"
-#include "core/crypto/crypto_core.h"
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
-#include "core/io/zip_io.h"
-#include "core/object/class_db.h"
-#include "core/version.h"
-#include "editor/editor_export.h"
-#include "editor/editor_node.h"
-#include "platform/uwp/logo.gen.h"
-
-#include "thirdparty/minizip/unzip.h"
-#include "thirdparty/minizip/zip.h"
-
-#include <zlib.h>
-
-// Capabilities
-static const char *uwp_capabilities[] = {
-	"allJoyn",
-	"codeGeneration",
-	"internetClient",
-	"internetClientServer",
-	"privateNetworkClientServer",
-	nullptr
-};
-static const char *uwp_uap_capabilities[] = {
-	"appointments",
-	"blockedChatMessages",
-	"chat",
-	"contacts",
-	"enterpriseAuthentication",
-	"musicLibrary",
-	"objects3D",
-	"picturesLibrary",
-	"phoneCall",
-	"removableStorage",
-	"sharedUserCertificates",
-	"userAccountInformation",
-	"videosLibrary",
-	"voipCall",
-	nullptr
-};
-static const char *uwp_device_capabilities[] = {
-	"bluetooth",
-	"location",
-	"microphone",
-	"proximity",
-	"webcam",
-	nullptr
-};
-
-class AppxPackager {
-	enum {
-		FILE_HEADER_MAGIC = 0x04034b50,
-		DATA_DESCRIPTOR_MAGIC = 0x08074b50,
-		CENTRAL_DIR_MAGIC = 0x02014b50,
-		END_OF_CENTRAL_DIR_MAGIC = 0x06054b50,
-		ZIP64_END_OF_CENTRAL_DIR_MAGIC = 0x06064b50,
-		ZIP64_END_DIR_LOCATOR_MAGIC = 0x07064b50,
-		P7X_SIGNATURE = 0x58434b50,
-		ZIP64_HEADER_ID = 0x0001,
-		ZIP_VERSION = 20,
-		ZIP_ARCHIVE_VERSION = 45,
-		GENERAL_PURPOSE = 0x00,
-		BASE_FILE_HEADER_SIZE = 30,
-		DATA_DESCRIPTOR_SIZE = 24,
-		BASE_CENTRAL_DIR_SIZE = 46,
-		EXTRA_FIELD_LENGTH = 28,
-		ZIP64_HEADER_SIZE = 24,
-		ZIP64_END_OF_CENTRAL_DIR_SIZE = (56 - 12),
-		END_OF_CENTRAL_DIR_SIZE = 42,
-		BLOCK_SIZE = 65536,
-	};
-
-	struct BlockHash {
-		String base64_hash;
-		size_t compressed_size = 0;
-	};
-
-	struct FileMeta {
-		String name;
-		int lfh_size = 0;
-		bool compressed = false;
-		size_t compressed_size = 0;
-		size_t uncompressed_size = 0;
-		Vector<BlockHash> hashes;
-		uLong file_crc32 = 0;
-		ZPOS64_T zip_offset = 0;
-	};
-
-	String progress_task;
-	FileAccess *package = nullptr;
-
-	Set<String> mime_types;
-
-	Vector<FileMeta> file_metadata;
-
-	ZPOS64_T central_dir_offset;
-	ZPOS64_T end_of_central_dir_offset;
-	Vector<uint8_t> central_dir_data;
-
-	String hash_block(const uint8_t *p_block_data, size_t p_block_len);
-
-	void make_block_map(const String &p_path);
-	void make_content_types(const String &p_path);
-
-	_FORCE_INLINE_ unsigned int buf_put_int16(uint16_t p_val, uint8_t *p_buf) {
-		for (int i = 0; i < 2; i++) {
-			*p_buf++ = (p_val >> (i * 8)) & 0xFF;
-		}
-		return 2;
-	}
-
-	_FORCE_INLINE_ unsigned int buf_put_int32(uint32_t p_val, uint8_t *p_buf) {
-		for (int i = 0; i < 4; i++) {
-			*p_buf++ = (p_val >> (i * 8)) & 0xFF;
-		}
-		return 4;
-	}
-
-	_FORCE_INLINE_ unsigned int buf_put_int64(uint64_t p_val, uint8_t *p_buf) {
-		for (int i = 0; i < 8; i++) {
-			*p_buf++ = (p_val >> (i * 8)) & 0xFF;
-		}
-		return 8;
-	}
-
-	_FORCE_INLINE_ unsigned int buf_put_string(String p_val, uint8_t *p_buf) {
-		for (int i = 0; i < p_val.length(); i++) {
-			*p_buf++ = p_val.utf8().get(i);
-		}
-		return p_val.length();
-	}
-
-	Vector<uint8_t> make_file_header(FileMeta p_file_meta);
-	void store_central_dir_header(const FileMeta &p_file, bool p_do_hash = true);
-	Vector<uint8_t> make_end_of_central_record();
-
-	String content_type(String p_extension);
-
-public:
-	void set_progress_task(String p_task) { progress_task = p_task; }
-	void init(FileAccess *p_fa);
-	Error add_file(String p_file_name, const uint8_t *p_buffer, size_t p_len, int p_file_no, int p_total_files, bool p_compress = false);
-	void finish();
-
-	AppxPackager();
-	~AppxPackager();
-};
-
-///////////////////////////////////////////////////////////////////////////
-
-String AppxPackager::hash_block(const uint8_t *p_block_data, size_t p_block_len) {
-	unsigned char hash[32];
-	char base64[45];
-
-	CryptoCore::sha256(p_block_data, p_block_len, hash);
-	size_t len = 0;
-	CryptoCore::b64_encode((unsigned char *)base64, 45, &len, (unsigned char *)hash, 32);
-	base64[44] = '\0';
-
-	return String(base64);
-}
-
-void AppxPackager::make_block_map(const String &p_path) {
-	FileAccess *tmp_file = FileAccess::open(p_path, FileAccess::WRITE);
-
-	tmp_file->store_string("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>");
-	tmp_file->store_string("<BlockMap xmlns=\"http://schemas.microsoft.com/appx/2010/blockmap\" HashMethod=\"http://www.w3.org/2001/04/xmlenc#sha256\">");
-
-	for (int i = 0; i < file_metadata.size(); i++) {
-		FileMeta file = file_metadata[i];
-
-		tmp_file->store_string(
-				"<File Name=\"" + file.name.replace("/", "\\") + "\" Size=\"" + itos(file.uncompressed_size) + "\" LfhSize=\"" + itos(file.lfh_size) + "\">");
-
-		for (int j = 0; j < file.hashes.size(); j++) {
-			tmp_file->store_string("<Block Hash=\"" + file.hashes[j].base64_hash + "\" ");
-			if (file.compressed) {
-				tmp_file->store_string("Size=\"" + itos(file.hashes[j].compressed_size) + "\" ");
-			}
-			tmp_file->store_string("/>");
-		}
-
-		tmp_file->store_string("</File>");
-	}
-
-	tmp_file->store_string("</BlockMap>");
-
-	tmp_file->close();
-	memdelete(tmp_file);
-}
-
-String AppxPackager::content_type(String p_extension) {
-	if (p_extension == "png") {
-		return "image/png";
-	} else if (p_extension == "jpg") {
-		return "image/jpg";
-	} else if (p_extension == "xml") {
-		return "application/xml";
-	} else if (p_extension == "exe" || p_extension == "dll") {
-		return "application/x-msdownload";
-	} else {
-		return "application/octet-stream";
-	}
-}
-
-void AppxPackager::make_content_types(const String &p_path) {
-	FileAccess *tmp_file = FileAccess::open(p_path, FileAccess::WRITE);
-
-	tmp_file->store_string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-	tmp_file->store_string("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">");
-
-	Map<String, String> types;
-
-	for (int i = 0; i < file_metadata.size(); i++) {
-		String ext = file_metadata[i].name.get_extension().to_lower();
-
-		if (types.has(ext)) {
-			continue;
-		}
-
-		types[ext] = content_type(ext);
-
-		tmp_file->store_string("<Default Extension=\"" + ext + "\" ContentType=\"" + types[ext] + "\" />");
-	}
-
-	// Appx signature file
-	tmp_file->store_string("<Default Extension=\"p7x\" ContentType=\"application/octet-stream\" />");
-
-	// Override for package files
-	tmp_file->store_string("<Override PartName=\"/AppxManifest.xml\" ContentType=\"application/vnd.ms-appx.manifest+xml\" />");
-	tmp_file->store_string("<Override PartName=\"/AppxBlockMap.xml\" ContentType=\"application/vnd.ms-appx.blockmap+xml\" />");
-	tmp_file->store_string("<Override PartName=\"/AppxSignature.p7x\" ContentType=\"application/vnd.ms-appx.signature\" />");
-	tmp_file->store_string("<Override PartName=\"/AppxMetadata/CodeIntegrity.cat\" ContentType=\"application/vnd.ms-pkiseccat\" />");
-
-	tmp_file->store_string("</Types>");
-
-	tmp_file->close();
-	memdelete(tmp_file);
-}
-
-Vector<uint8_t> AppxPackager::make_file_header(FileMeta p_file_meta) {
-	Vector<uint8_t> buf;
-	buf.resize(BASE_FILE_HEADER_SIZE + p_file_meta.name.length());
-
-	int offs = 0;
-	// Write magic
-	offs += buf_put_int32(FILE_HEADER_MAGIC, &buf.write[offs]);
-
-	// Version
-	offs += buf_put_int16(ZIP_VERSION, &buf.write[offs]);
-
-	// Special flag
-	offs += buf_put_int16(GENERAL_PURPOSE, &buf.write[offs]);
-
-	// Compression
-	offs += buf_put_int16(p_file_meta.compressed ? Z_DEFLATED : 0, &buf.write[offs]);
-
-	// File date and time
-	offs += buf_put_int32(0, &buf.write[offs]);
-
-	// CRC-32
-	offs += buf_put_int32(p_file_meta.file_crc32, &buf.write[offs]);
-
-	// Compressed size
-	offs += buf_put_int32(p_file_meta.compressed_size, &buf.write[offs]);
-
-	// Uncompressed size
-	offs += buf_put_int32(p_file_meta.uncompressed_size, &buf.write[offs]);
-
-	// File name length
-	offs += buf_put_int16(p_file_meta.name.length(), &buf.write[offs]);
-
-	// Extra data length
-	offs += buf_put_int16(0, &buf.write[offs]);
-
-	// File name
-	offs += buf_put_string(p_file_meta.name, &buf.write[offs]);
-
-	// Done!
-	return buf;
-}
-
-void AppxPackager::store_central_dir_header(const FileMeta &p_file, bool p_do_hash) {
-	Vector<uint8_t> &buf = central_dir_data;
-	int offs = buf.size();
-	buf.resize(buf.size() + BASE_CENTRAL_DIR_SIZE + p_file.name.length());
-
-	// Write magic
-	offs += buf_put_int32(CENTRAL_DIR_MAGIC, &buf.write[offs]);
-
-	// ZIP versions
-	offs += buf_put_int16(ZIP_ARCHIVE_VERSION, &buf.write[offs]);
-	offs += buf_put_int16(ZIP_VERSION, &buf.write[offs]);
-
-	// General purpose flag
-	offs += buf_put_int16(GENERAL_PURPOSE, &buf.write[offs]);
-
-	// Compression
-	offs += buf_put_int16(p_file.compressed ? Z_DEFLATED : 0, &buf.write[offs]);
-
-	// Modification date/time
-	offs += buf_put_int32(0, &buf.write[offs]);
-
-	// Crc-32
-	offs += buf_put_int32(p_file.file_crc32, &buf.write[offs]);
-
-	// File sizes
-	offs += buf_put_int32(p_file.compressed_size, &buf.write[offs]);
-	offs += buf_put_int32(p_file.uncompressed_size, &buf.write[offs]);
-
-	// File name length
-	offs += buf_put_int16(p_file.name.length(), &buf.write[offs]);
-
-	// Extra field length
-	offs += buf_put_int16(0, &buf.write[offs]);
-
-	// Comment length
-	offs += buf_put_int16(0, &buf.write[offs]);
-
-	// Disk number start, internal/external file attributes
-	for (int i = 0; i < 8; i++) {
-		buf.write[offs++] = 0;
-	}
-
-	// Relative offset
-	offs += buf_put_int32(p_file.zip_offset, &buf.write[offs]);
-
-	// File name
-	offs += buf_put_string(p_file.name, &buf.write[offs]);
-
-	// Done!
-}
-
-Vector<uint8_t> AppxPackager::make_end_of_central_record() {
-	Vector<uint8_t> buf;
-	buf.resize(ZIP64_END_OF_CENTRAL_DIR_SIZE + 12 + END_OF_CENTRAL_DIR_SIZE); // Size plus magic
-
-	int offs = 0;
-
-	// Write magic
-	offs += buf_put_int32(ZIP64_END_OF_CENTRAL_DIR_MAGIC, &buf.write[offs]);
-
-	// Size of this record
-	offs += buf_put_int64(ZIP64_END_OF_CENTRAL_DIR_SIZE, &buf.write[offs]);
-
-	// Version (yes, twice)
-	offs += buf_put_int16(ZIP_ARCHIVE_VERSION, &buf.write[offs]);
-	offs += buf_put_int16(ZIP_ARCHIVE_VERSION, &buf.write[offs]);
-
-	// Disk number
-	for (int i = 0; i < 8; i++) {
-		buf.write[offs++] = 0;
-	}
-
-	// Number of entries (total and per disk)
-	offs += buf_put_int64(file_metadata.size(), &buf.write[offs]);
-	offs += buf_put_int64(file_metadata.size(), &buf.write[offs]);
-
-	// Size of central dir
-	offs += buf_put_int64(central_dir_data.size(), &buf.write[offs]);
-
-	// Central dir offset
-	offs += buf_put_int64(central_dir_offset, &buf.write[offs]);
-
-	////// ZIP64 locator
-
-	// Write magic for zip64 central dir locator
-	offs += buf_put_int32(ZIP64_END_DIR_LOCATOR_MAGIC, &buf.write[offs]);
-
-	// Disk number
-	for (int i = 0; i < 4; i++) {
-		buf.write[offs++] = 0;
-	}
-
-	// Relative offset
-	offs += buf_put_int64(end_of_central_dir_offset, &buf.write[offs]);
-
-	// Number of disks
-	offs += buf_put_int32(1, &buf.write[offs]);
-
-	/////// End of zip directory
-
-	// Write magic for end central dir
-	offs += buf_put_int32(END_OF_CENTRAL_DIR_MAGIC, &buf.write[offs]);
-
-	// Dummy stuff for Zip64
-	for (int i = 0; i < 4; i++) {
-		buf.write[offs++] = 0x0;
-	}
-	for (int i = 0; i < 12; i++) {
-		buf.write[offs++] = 0xFF;
-	}
-
-	// Size of comments
-	for (int i = 0; i < 2; i++) {
-		buf.write[offs++] = 0;
-	}
-
-	// Done!
-	return buf;
-}
-
-void AppxPackager::init(FileAccess *p_fa) {
-	package = p_fa;
-	central_dir_offset = 0;
-	end_of_central_dir_offset = 0;
-}
-
-Error AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t p_len, int p_file_no, int p_total_files, bool p_compress) {
-	if (p_file_no >= 1 && p_total_files >= 1) {
-		if (EditorNode::progress_task_step(progress_task, "File: " + p_file_name, (p_file_no * 100) / p_total_files)) {
-			return ERR_SKIP;
-		}
-	}
-
-	FileMeta meta;
-	meta.name = p_file_name;
-	meta.uncompressed_size = p_len;
-	meta.compressed_size = p_len;
-	meta.compressed = p_compress;
-	meta.zip_offset = package->get_position();
-
-	Vector<uint8_t> file_buffer;
-
-	// Data for compression
-	z_stream strm;
-	FileAccess *strm_f = nullptr;
-	Vector<uint8_t> strm_in;
-	strm_in.resize(BLOCK_SIZE);
-	Vector<uint8_t> strm_out;
-
-	if (p_compress) {
-		strm.zalloc = zipio_alloc;
-		strm.zfree = zipio_free;
-		strm.opaque = &strm_f;
-
-		strm_out.resize(BLOCK_SIZE + 8);
-
-		deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
-	}
-
-	int step = 0;
-
-	while (p_len - step > 0) {
-		size_t block_size = (p_len - step) > BLOCK_SIZE ? (size_t)BLOCK_SIZE : (p_len - step);
-
-		for (uint64_t i = 0; i < block_size; i++) {
-			strm_in.write[i] = p_buffer[step + i];
-		}
-
-		BlockHash bh;
-		bh.base64_hash = hash_block(strm_in.ptr(), block_size);
-
-		if (p_compress) {
-			strm.avail_in = block_size;
-			strm.avail_out = strm_out.size();
-			strm.next_in = (uint8_t *)strm_in.ptr();
-			strm.next_out = strm_out.ptrw();
-
-			int total_out_before = strm.total_out;
-
-			int err = deflate(&strm, Z_FULL_FLUSH);
-			ERR_FAIL_COND_V(err < 0, ERR_BUG); // Negative means bug
-
-			bh.compressed_size = strm.total_out - total_out_before;
-
-			//package->store_buffer(strm_out.ptr(), strm.total_out - total_out_before);
-			int start = file_buffer.size();
-			file_buffer.resize(file_buffer.size() + bh.compressed_size);
-			for (uint64_t i = 0; i < bh.compressed_size; i++) {
-				file_buffer.write[start + i] = strm_out[i];
-			}
-		} else {
-			bh.compressed_size = block_size;
-			//package->store_buffer(strm_in.ptr(), block_size);
-			int start = file_buffer.size();
-			file_buffer.resize(file_buffer.size() + block_size);
-			for (uint64_t i = 0; i < bh.compressed_size; i++) {
-				file_buffer.write[start + i] = strm_in[i];
-			}
-		}
-
-		meta.hashes.push_back(bh);
-
-		step += block_size;
-	}
-
-	if (p_compress) {
-		strm.avail_in = 0;
-		strm.avail_out = strm_out.size();
-		strm.next_in = (uint8_t *)strm_in.ptr();
-		strm.next_out = strm_out.ptrw();
-
-		int total_out_before = strm.total_out;
-
-		deflate(&strm, Z_FINISH);
-
-		//package->store_buffer(strm_out.ptr(), strm.total_out - total_out_before);
-		int start = file_buffer.size();
-		file_buffer.resize(file_buffer.size() + (strm.total_out - total_out_before));
-		for (uint64_t i = 0; i < (strm.total_out - total_out_before); i++) {
-			file_buffer.write[start + i] = strm_out[i];
-		}
-
-		deflateEnd(&strm);
-		meta.compressed_size = strm.total_out;
-
-	} else {
-		meta.compressed_size = p_len;
-	}
-
-	// Calculate file CRC-32
-	uLong crc = crc32(0L, Z_NULL, 0);
-	crc = crc32(crc, p_buffer, p_len);
-	meta.file_crc32 = crc;
-
-	// Create file header
-	Vector<uint8_t> file_header = make_file_header(meta);
-	meta.lfh_size = file_header.size();
-
-	// Store the header and file;
-	package->store_buffer(file_header.ptr(), file_header.size());
-	package->store_buffer(file_buffer.ptr(), file_buffer.size());
-
-	file_metadata.push_back(meta);
-
-	return OK;
-}
-
-void AppxPackager::finish() {
-	// Create and add block map file
-	EditorNode::progress_task_step("export", "Creating block map...", 4);
-
-	const String &tmp_blockmap_file_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpblockmap.xml");
-	make_block_map(tmp_blockmap_file_path);
-
-	FileAccess *blockmap_file = FileAccess::open(tmp_blockmap_file_path, FileAccess::READ);
-	Vector<uint8_t> blockmap_buffer;
-	blockmap_buffer.resize(blockmap_file->get_length());
-
-	blockmap_file->get_buffer(blockmap_buffer.ptrw(), blockmap_buffer.size());
-
-	add_file("AppxBlockMap.xml", blockmap_buffer.ptr(), blockmap_buffer.size(), -1, -1, true);
-
-	blockmap_file->close();
-	memdelete(blockmap_file);
-
-	// Add content types
-
-	EditorNode::progress_task_step("export", "Setting content types...", 5);
-
-	const String &tmp_content_types_file_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpcontenttypes.xml");
-	make_content_types(tmp_content_types_file_path);
-
-	FileAccess *types_file = FileAccess::open(tmp_content_types_file_path, FileAccess::READ);
-	Vector<uint8_t> types_buffer;
-	types_buffer.resize(types_file->get_length());
-
-	types_file->get_buffer(types_buffer.ptrw(), types_buffer.size());
-
-	add_file("[Content_Types].xml", types_buffer.ptr(), types_buffer.size(), -1, -1, true);
-
-	types_file->close();
-	memdelete(types_file);
-
-	// Cleanup generated files.
-	DirAccess::remove_file_or_error(tmp_blockmap_file_path);
-	DirAccess::remove_file_or_error(tmp_content_types_file_path);
-
-	// Pre-process central directory before signing
-	for (int i = 0; i < file_metadata.size(); i++) {
-		store_central_dir_header(file_metadata[i]);
-	}
-
-	// Write central directory
-	EditorNode::progress_task_step("export", "Finishing package...", 6);
-	central_dir_offset = package->get_position();
-	package->store_buffer(central_dir_data.ptr(), central_dir_data.size());
-
-	// End record
-	end_of_central_dir_offset = package->get_position();
-	Vector<uint8_t> end_record = make_end_of_central_record();
-	package->store_buffer(end_record.ptr(), end_record.size());
-
-	package->close();
-	memdelete(package);
-	package = nullptr;
-}
-
-AppxPackager::AppxPackager() {}
-
-AppxPackager::~AppxPackager() {}
-
-////////////////////////////////////////////////////////////////////
-
-class EditorExportPlatformUWP : public EditorExportPlatform {
-	GDCLASS(EditorExportPlatformUWP, EditorExportPlatform);
-
-	Ref<ImageTexture> logo;
-
-	enum Platform {
-		ARM,
-		X86,
-		X64
-	};
-
-	bool _valid_resource_name(const String &p_name) const {
-		if (p_name.is_empty()) {
-			return false;
-		}
-		if (p_name.ends_with(".")) {
-			return false;
-		}
-
-		static const char *invalid_names[] = {
-			"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7",
-			"COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
-			nullptr
-		};
-
-		const char **t = invalid_names;
-		while (*t) {
-			if (p_name == *t) {
-				return false;
-			}
-			t++;
-		}
-
-		return true;
-	}
-
-	bool _valid_guid(const String &p_guid) const {
-		Vector<String> parts = p_guid.split("-");
-
-		if (parts.size() != 5) {
-			return false;
-		}
-		if (parts[0].length() != 8) {
-			return false;
-		}
-		for (int i = 1; i < 4; i++) {
-			if (parts[i].length() != 4) {
-				return false;
-			}
-		}
-		if (parts[4].length() != 12) {
-			return false;
-		}
-
-		return true;
-	}
-
-	bool _valid_bgcolor(const String &p_color) const {
-		if (p_color.is_empty()) {
-			return true;
-		}
-		if (p_color.begins_with("#") && p_color.is_valid_html_color()) {
-			return true;
-		}
-
-		// Colors from https://msdn.microsoft.com/en-us/library/windows/apps/dn934817.aspx
-		static const char *valid_colors[] = {
-			"aliceBlue", "antiqueWhite", "aqua", "aquamarine", "azure", "beige",
-			"bisque", "black", "blanchedAlmond", "blue", "blueViolet", "brown",
-			"burlyWood", "cadetBlue", "chartreuse", "chocolate", "coral", "cornflowerBlue",
-			"cornsilk", "crimson", "cyan", "darkBlue", "darkCyan", "darkGoldenrod",
-			"darkGray", "darkGreen", "darkKhaki", "darkMagenta", "darkOliveGreen", "darkOrange",
-			"darkOrchid", "darkRed", "darkSalmon", "darkSeaGreen", "darkSlateBlue", "darkSlateGray",
-			"darkTurquoise", "darkViolet", "deepPink", "deepSkyBlue", "dimGray", "dodgerBlue",
-			"firebrick", "floralWhite", "forestGreen", "fuchsia", "gainsboro", "ghostWhite",
-			"gold", "goldenrod", "gray", "green", "greenYellow", "honeydew",
-			"hotPink", "indianRed", "indigo", "ivory", "khaki", "lavender",
-			"lavenderBlush", "lawnGreen", "lemonChiffon", "lightBlue", "lightCoral", "lightCyan",
-			"lightGoldenrodYellow", "lightGreen", "lightGray", "lightPink", "lightSalmon", "lightSeaGreen",
-			"lightSkyBlue", "lightSlateGray", "lightSteelBlue", "lightYellow", "lime", "limeGreen",
-			"linen", "magenta", "maroon", "mediumAquamarine", "mediumBlue", "mediumOrchid",
-			"mediumPurple", "mediumSeaGreen", "mediumSlateBlue", "mediumSpringGreen", "mediumTurquoise", "mediumVioletRed",
-			"midnightBlue", "mintCream", "mistyRose", "moccasin", "navajoWhite", "navy",
-			"oldLace", "olive", "oliveDrab", "orange", "orangeRed", "orchid",
-			"paleGoldenrod", "paleGreen", "paleTurquoise", "paleVioletRed", "papayaWhip", "peachPuff",
-			"peru", "pink", "plum", "powderBlue", "purple", "red",
-			"rosyBrown", "royalBlue", "saddleBrown", "salmon", "sandyBrown", "seaGreen",
-			"seaShell", "sienna", "silver", "skyBlue", "slateBlue", "slateGray",
-			"snow", "springGreen", "steelBlue", "tan", "teal", "thistle",
-			"tomato", "transparent", "turquoise", "violet", "wheat", "white",
-			"whiteSmoke", "yellow", "yellowGreen",
-			nullptr
-		};
-
-		const char **color = valid_colors;
-
-		while (*color) {
-			if (p_color == *color) {
-				return true;
-			}
-			color++;
-		}
-
-		return false;
-	}
-
-	bool _valid_image(const StreamTexture2D *p_image, int p_width, int p_height) const {
-		if (!p_image) {
-			return false;
-		}
-
-		// TODO: Add resource creation or image rescaling to enable other scales:
-		// 1.25, 1.5, 2.0
-		return p_width == p_image->get_width() && p_height == p_image->get_height();
-	}
-
-	Vector<uint8_t> _fix_manifest(const Ref<EditorExportPreset> &p_preset, const Vector<uint8_t> &p_template, bool p_give_internet) const {
-		String result = String::utf8((const char *)p_template.ptr(), p_template.size());
-
-		result = result.replace("$godot_version$", VERSION_FULL_NAME);
-
-		result = result.replace("$identity_name$", p_preset->get("package/unique_name"));
-		result = result.replace("$publisher$", p_preset->get("package/publisher"));
-
-		result = result.replace("$product_guid$", p_preset->get("identity/product_guid"));
-		result = result.replace("$publisher_guid$", p_preset->get("identity/publisher_guid"));
-
-		String version = itos(p_preset->get("version/major")) + "." + itos(p_preset->get("version/minor")) + "." + itos(p_preset->get("version/build")) + "." + itos(p_preset->get("version/revision"));
-		result = result.replace("$version_string$", version);
-
-		Platform arch = (Platform)(int)p_preset->get("architecture/target");
-		String architecture = arch == ARM ? "arm" : (arch == X86 ? "x86" : "x64");
-		result = result.replace("$architecture$", architecture);
-
-		result = result.replace("$display_name$", String(p_preset->get("package/display_name")).is_empty() ? (String)ProjectSettings::get_singleton()->get("application/config/name") : String(p_preset->get("package/display_name")));
-
-		result = result.replace("$publisher_display_name$", p_preset->get("package/publisher_display_name"));
-		result = result.replace("$app_description$", p_preset->get("package/description"));
-		result = result.replace("$bg_color$", p_preset->get("images/background_color"));
-		result = result.replace("$short_name$", p_preset->get("package/short_name"));
-
-		String name_on_tiles = "";
-		if ((bool)p_preset->get("tiles/show_name_on_square150x150")) {
-			name_on_tiles += "          <uap:ShowOn Tile=\"square150x150Logo\" />\n";
-		}
-		if ((bool)p_preset->get("tiles/show_name_on_wide310x150")) {
-			name_on_tiles += "          <uap:ShowOn Tile=\"wide310x150Logo\" />\n";
-		}
-		if ((bool)p_preset->get("tiles/show_name_on_square310x310")) {
-			name_on_tiles += "          <uap:ShowOn Tile=\"square310x310Logo\" />\n";
-		}
-
-		String show_name_on_tiles = "";
-		if (!name_on_tiles.is_empty()) {
-			show_name_on_tiles = "<uap:ShowNameOnTiles>\n" + name_on_tiles + "        </uap:ShowNameOnTiles>";
-		}
-
-		result = result.replace("$name_on_tiles$", name_on_tiles);
-
-		String rotations = "";
-		if ((bool)p_preset->get("orientation/landscape")) {
-			rotations += "          <uap:Rotation Preference=\"landscape\" />\n";
-		}
-		if ((bool)p_preset->get("orientation/portrait")) {
-			rotations += "          <uap:Rotation Preference=\"portrait\" />\n";
-		}
-		if ((bool)p_preset->get("orientation/landscape_flipped")) {
-			rotations += "          <uap:Rotation Preference=\"landscapeFlipped\" />\n";
-		}
-		if ((bool)p_preset->get("orientation/portrait_flipped")) {
-			rotations += "          <uap:Rotation Preference=\"portraitFlipped\" />\n";
-		}
-
-		String rotation_preference = "";
-		if (!rotations.is_empty()) {
-			rotation_preference = "<uap:InitialRotationPreference>\n" + rotations + "        </uap:InitialRotationPreference>";
-		}
-
-		result = result.replace("$rotation_preference$", rotation_preference);
-
-		String capabilities_elements = "";
-		const char **basic = uwp_capabilities;
-		while (*basic) {
-			if ((bool)p_preset->get("capabilities/" + String(*basic))) {
-				capabilities_elements += "    <Capability Name=\"" + String(*basic) + "\" />\n";
-			}
-			basic++;
-		}
-		const char **uap = uwp_uap_capabilities;
-		while (*uap) {
-			if ((bool)p_preset->get("capabilities/" + String(*uap))) {
-				capabilities_elements += "    <uap:Capability Name=\"" + String(*uap) + "\" />\n";
-			}
-			uap++;
-		}
-		const char **device = uwp_device_capabilities;
-		while (*device) {
-			if ((bool)p_preset->get("capabilities/" + String(*device))) {
-				capabilities_elements += "    <DeviceCapability Name=\"" + String(*device) + "\" />\n";
-			}
-			device++;
-		}
-
-		if (!((bool)p_preset->get("capabilities/internetClient")) && p_give_internet) {
-			capabilities_elements += "    <Capability Name=\"internetClient\" />\n";
-		}
-
-		String capabilities_string = "<Capabilities />";
-		if (!capabilities_elements.is_empty()) {
-			capabilities_string = "<Capabilities>\n" + capabilities_elements + "  </Capabilities>";
-		}
-
-		result = result.replace("$capabilities_place$", capabilities_string);
-
-		Vector<uint8_t> r_ret;
-		r_ret.resize(result.length());
-
-		for (int i = 0; i < result.length(); i++) {
-			r_ret.write[i] = result.utf8().get(i);
-		}
-
-		return r_ret;
-	}
-
-	Vector<uint8_t> _get_image_data(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
-		Vector<uint8_t> data;
-		StreamTexture2D *texture = nullptr;
-
-		if (p_path.find("StoreLogo") != -1) {
-			texture = p_preset->get("images/store_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/store_logo")));
-		} else if (p_path.find("Square44x44Logo") != -1) {
-			texture = p_preset->get("images/square44x44_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square44x44_logo")));
-		} else if (p_path.find("Square71x71Logo") != -1) {
-			texture = p_preset->get("images/square71x71_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square71x71_logo")));
-		} else if (p_path.find("Square150x150Logo") != -1) {
-			texture = p_preset->get("images/square150x150_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square150x150_logo")));
-		} else if (p_path.find("Square310x310Logo") != -1) {
-			texture = p_preset->get("images/square310x310_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square310x310_logo")));
-		} else if (p_path.find("Wide310x150Logo") != -1) {
-			texture = p_preset->get("images/wide310x150_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/wide310x150_logo")));
-		} else if (p_path.find("SplashScreen") != -1) {
-			texture = p_preset->get("images/splash_screen").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/splash_screen")));
-		} else {
-			ERR_PRINT("Unable to load logo");
-		}
-
-		if (!texture) {
-			return data;
-		}
-
-		String tmp_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("uwp_tmp_logo.png");
-
-		Error err = texture->get_image()->save_png(tmp_path);
-
-		if (err != OK) {
-			String err_string = "Couldn't save temp logo file.";
-
-			EditorNode::add_io_error(err_string);
-			ERR_FAIL_V_MSG(data, err_string);
-		}
-
-		FileAccess *f = FileAccess::open(tmp_path, FileAccess::READ, &err);
-
-		if (err != OK) {
-			String err_string = "Couldn't open temp logo file.";
-			// Cleanup generated file.
-			DirAccess::remove_file_or_error(tmp_path);
-			EditorNode::add_io_error(err_string);
-			ERR_FAIL_V_MSG(data, err_string);
-		}
-
-		data.resize(f->get_length());
-		f->get_buffer(data.ptrw(), data.size());
-
-		f->close();
-		memdelete(f);
-		DirAccess::remove_file_or_error(tmp_path);
-
-		return data;
-	}
-
-	static bool _should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data) {
-		/* TODO: This was copied verbatim from Android export. It should be
-	* refactored to the parent class and also be used for .zip export.
-	*/
-
-		/*
-	*  By not compressing files with little or not benefit in doing so,
-	*  a performance gain is expected at runtime. Moreover, if the APK is
-	*  zip-aligned, assets stored as they are can be efficiently read by
-	*  Android by memory-mapping them.
-	*/
-
-		// -- Unconditional uncompress to mimic AAPT plus some other
-
-		static const char *unconditional_compress_ext[] = {
-			// From https://github.com/android/platform_frameworks_base/blob/master/tools/aapt/Package.cpp
-			// These formats are already compressed, or don't compress well:
-			".jpg", ".jpeg", ".png", ".gif",
-			".wav", ".mp2", ".mp3", ".ogg", ".aac",
-			".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet",
-			".rtttl", ".imy", ".xmf", ".mp4", ".m4a",
-			".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2",
-			".amr", ".awb", ".wma", ".wmv",
-			// Godot-specific:
-			".webp", // Same reasoning as .png
-			".cfb", // Don't let small config files slow-down startup
-			".scn", // Binary scenes are usually already compressed
-			".stex", // Streamable textures are usually already compressed
-			// Trailer for easier processing
-			nullptr
-		};
-
-		for (const char **ext = unconditional_compress_ext; *ext; ++ext) {
-			if (p_path.to_lower().ends_with(String(*ext))) {
-				return false;
-			}
-		}
-
-		// -- Compressed resource?
-
-		if (p_data.size() >= 4 && p_data[0] == 'R' && p_data[1] == 'S' && p_data[2] == 'C' && p_data[3] == 'C') {
-			// Already compressed
-			return false;
-		}
-
-		// --- TODO: Decide on texture resources according to their image compression setting
-
-		return true;
-	}
-
-	static Error save_appx_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) {
-		AppxPackager *packager = (AppxPackager *)p_userdata;
-		String dst_path = p_path.replace_first("res://", "game/");
-
-		return packager->add_file(dst_path, p_data.ptr(), p_data.size(), p_file, p_total, _should_compress_asset(p_path, p_data));
-	}
-
-public:
-	virtual String get_name() const override {
-		return "UWP";
-	}
-	virtual String get_os_name() const override {
-		return "UWP";
-	}
-
-	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override {
-		List<String> list;
-		list.push_back("appx");
-		return list;
-	}
-
-	virtual Ref<Texture2D> get_logo() const override {
-		return logo;
-	}
-
-	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override {
-		r_features->push_back("s3tc");
-		r_features->push_back("etc");
-		switch ((int)p_preset->get("architecture/target")) {
-			case EditorExportPlatformUWP::ARM: {
-				r_features->push_back("arm");
-			} break;
-			case EditorExportPlatformUWP::X86: {
-				r_features->push_back("32");
-			} break;
-			case EditorExportPlatformUWP::X64: {
-				r_features->push_back("64");
-			} break;
-		}
-	}
-
-	virtual void get_export_options(List<ExportOption> *r_options) override {
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "architecture/target", PROPERTY_HINT_ENUM, "arm,x86,x64"), 1));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "command_line/extra_args"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/display_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/short_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/unique_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game.Name"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/description"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/publisher", PROPERTY_HINT_PLACEHOLDER_TEXT, "CN=CompanyName"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/publisher_display_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Company Name"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "identity/product_guid", PROPERTY_HINT_PLACEHOLDER_TEXT, "00000000-0000-0000-0000-000000000000"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "identity/publisher_guid", PROPERTY_HINT_PLACEHOLDER_TEXT, "00000000-0000-0000-0000-000000000000"), ""));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "signing/certificate", PROPERTY_HINT_GLOBAL_FILE, "*.pfx"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "signing/password"), ""));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "signing/algorithm", PROPERTY_HINT_ENUM, "MD5,SHA1,SHA256"), 2));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/major"), 1));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/minor"), 0));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/build"), 0));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/revision"), 0));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/landscape"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/portrait"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/landscape_flipped"), true));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/portrait_flipped"), true));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "images/background_color"), "transparent"));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/store_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square44x44_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square71x71_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square150x150_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square310x310_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/wide310x150_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/splash_screen", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
-
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "tiles/show_name_on_square150x150"), false));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "tiles/show_name_on_wide310x150"), false));
-		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "tiles/show_name_on_square310x310"), false));
-
-		// Capabilities
-		const char **basic = uwp_capabilities;
-		while (*basic) {
-			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*basic)), false));
-			basic++;
-		}
-
-		const char **uap = uwp_uap_capabilities;
-		while (*uap) {
-			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*uap)), false));
-			uap++;
-		}
-
-		const char **device = uwp_device_capabilities;
-		while (*device) {
-			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*device)), false));
-			device++;
-		}
-	}
-
-	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override {
-		String err;
-		bool valid = false;
-
-		// Look for export templates (first official, and if defined custom templates).
-
-		Platform arch = (Platform)(int)(p_preset->get("architecture/target"));
-		String platform_infix;
-		switch (arch) {
-			case EditorExportPlatformUWP::ARM: {
-				platform_infix = "arm";
-			} break;
-			case EditorExportPlatformUWP::X86: {
-				platform_infix = "x86";
-			} break;
-			case EditorExportPlatformUWP::X64: {
-				platform_infix = "x64";
-			} break;
-		}
-
-		bool dvalid = exists_export_template("uwp_" + platform_infix + "_debug.zip", &err);
-		bool rvalid = exists_export_template("uwp_" + platform_infix + "_release.zip", &err);
-
-		if (p_preset->get("custom_template/debug") != "") {
-			dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
-			if (!dvalid) {
-				err += TTR("Custom debug template not found.") + "\n";
-			}
-		}
-		if (p_preset->get("custom_template/release") != "") {
-			rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
-			if (!rvalid) {
-				err += TTR("Custom release template not found.") + "\n";
-			}
-		}
-
-		valid = dvalid || rvalid;
-		r_missing_templates = !valid;
-
-		// Validate the rest of the configuration.
-
-		if (!_valid_resource_name(p_preset->get("package/short_name"))) {
-			valid = false;
-			err += TTR("Invalid package short name.") + "\n";
-		}
-
-		if (!_valid_resource_name(p_preset->get("package/unique_name"))) {
-			valid = false;
-			err += TTR("Invalid package unique name.") + "\n";
-		}
-
-		if (!_valid_resource_name(p_preset->get("package/publisher_display_name"))) {
-			valid = false;
-			err += TTR("Invalid package publisher display name.") + "\n";
-		}
-
-		if (!_valid_guid(p_preset->get("identity/product_guid"))) {
-			valid = false;
-			err += TTR("Invalid product GUID.") + "\n";
-		}
-
-		if (!_valid_guid(p_preset->get("identity/publisher_guid"))) {
-			valid = false;
-			err += TTR("Invalid publisher GUID.") + "\n";
-		}
-
-		if (!_valid_bgcolor(p_preset->get("images/background_color"))) {
-			valid = false;
-			err += TTR("Invalid background color.") + "\n";
-		}
-
-		if (!p_preset->get("images/store_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/store_logo"))), 50, 50)) {
-			valid = false;
-			err += TTR("Invalid Store Logo image dimensions (should be 50x50).") + "\n";
-		}
-
-		if (!p_preset->get("images/square44x44_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square44x44_logo"))), 44, 44)) {
-			valid = false;
-			err += TTR("Invalid square 44x44 logo image dimensions (should be 44x44).") + "\n";
-		}
-
-		if (!p_preset->get("images/square71x71_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square71x71_logo"))), 71, 71)) {
-			valid = false;
-			err += TTR("Invalid square 71x71 logo image dimensions (should be 71x71).") + "\n";
-		}
-
-		if (!p_preset->get("images/square150x150_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square150x150_logo"))), 150, 150)) {
-			valid = false;
-			err += TTR("Invalid square 150x150 logo image dimensions (should be 150x150).") + "\n";
-		}
-
-		if (!p_preset->get("images/square310x310_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square310x310_logo"))), 310, 310)) {
-			valid = false;
-			err += TTR("Invalid square 310x310 logo image dimensions (should be 310x310).") + "\n";
-		}
-
-		if (!p_preset->get("images/wide310x150_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/wide310x150_logo"))), 310, 150)) {
-			valid = false;
-			err += TTR("Invalid wide 310x150 logo image dimensions (should be 310x150).") + "\n";
-		}
-
-		if (!p_preset->get("images/splash_screen").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/splash_screen"))), 620, 300)) {
-			valid = false;
-			err += TTR("Invalid splash screen image dimensions (should be 620x300).") + "\n";
-		}
-
-		r_error = err;
-		return valid;
-	}
-
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override {
-		ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
-
-		String src_appx;
-
-		EditorProgress ep("export", "Exporting for UWP", 7, true);
-
-		if (p_debug) {
-			src_appx = p_preset->get("custom_template/debug");
-		} else {
-			src_appx = p_preset->get("custom_template/release");
-		}
-
-		src_appx = src_appx.strip_edges();
-
-		Platform arch = (Platform)(int)p_preset->get("architecture/target");
-
-		if (src_appx == "") {
-			String err, infix;
-			switch (arch) {
-				case ARM: {
-					infix = "_arm_";
-				} break;
-				case X86: {
-					infix = "_x86_";
-				} break;
-				case X64: {
-					infix = "_x64_";
-				} break;
-			}
-			if (p_debug) {
-				src_appx = find_export_template("uwp" + infix + "debug.zip", &err);
-			} else {
-				src_appx = find_export_template("uwp" + infix + "release.zip", &err);
-			}
-			if (src_appx == "") {
-				EditorNode::add_io_error(err);
-				return ERR_FILE_NOT_FOUND;
-			}
-		}
-
-		if (!DirAccess::exists(p_path.get_base_dir())) {
-			return ERR_FILE_BAD_PATH;
-		}
-
-		Error err = OK;
-
-		FileAccess *fa_pack = FileAccess::open(p_path, FileAccess::WRITE, &err);
-		ERR_FAIL_COND_V_MSG(err != OK, ERR_CANT_CREATE, "Cannot create file '" + p_path + "'.");
-
-		AppxPackager packager;
-		packager.init(fa_pack);
-
-		FileAccess *src_f = nullptr;
-		zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
-
-		if (ep.step("Creating package...", 0)) {
-			return ERR_SKIP;
-		}
-
-		unzFile pkg = unzOpen2(src_appx.utf8().get_data(), &io);
-
-		if (!pkg) {
-			EditorNode::add_io_error("Could not find template appx to export:\n" + src_appx);
-			return ERR_FILE_NOT_FOUND;
-		}
-
-		int ret = unzGoToFirstFile(pkg);
-
-		if (ep.step("Copying template files...", 1)) {
-			return ERR_SKIP;
-		}
-
-		EditorNode::progress_add_task("template_files", "Template files", 100);
-		packager.set_progress_task("template_files");
-
-		int template_files_amount = 9;
-		int template_file_no = 1;
-
-		while (ret == UNZ_OK) {
-			// get file name
-			unz_file_info info;
-			char fname[16834];
-			ret = unzGetCurrentFileInfo(pkg, &info, fname, 16834, nullptr, 0, nullptr, 0);
-
-			String path = fname;
-
-			if (path.ends_with("/")) {
-				// Ignore directories
-				ret = unzGoToNextFile(pkg);
-				continue;
-			}
-
-			Vector<uint8_t> data;
-			bool do_read = true;
-
-			if (path.begins_with("Assets/")) {
-				path = path.replace(".scale-100", "");
-
-				data = _get_image_data(p_preset, path);
-				if (data.size() > 0) {
-					do_read = false;
-				}
-			}
-
-			//read
-			if (do_read) {
-				data.resize(info.uncompressed_size);
-				unzOpenCurrentFile(pkg);
-				unzReadCurrentFile(pkg, data.ptrw(), data.size());
-				unzCloseCurrentFile(pkg);
-			}
-
-			if (path == "AppxManifest.xml") {
-				data = _fix_manifest(p_preset, data, p_flags & (DEBUG_FLAG_DUMB_CLIENT | DEBUG_FLAG_REMOTE_DEBUG));
-			}
-
-			print_line("ADDING: " + path);
-
-			err = packager.add_file(path, data.ptr(), data.size(), template_file_no++, template_files_amount, _should_compress_asset(path, data));
-			if (err != OK) {
-				return err;
-			}
-
-			ret = unzGoToNextFile(pkg);
-		}
-
-		EditorNode::progress_end_task("template_files");
-
-		if (ep.step("Creating command line...", 2)) {
-			return ERR_SKIP;
-		}
-
-		Vector<String> cl = ((String)p_preset->get("command_line/extra_args")).strip_edges().split(" ");
-		for (int i = 0; i < cl.size(); i++) {
-			if (cl[i].strip_edges().length() == 0) {
-				cl.remove(i);
-				i--;
-			}
-		}
-
-		if (!(p_flags & DEBUG_FLAG_DUMB_CLIENT)) {
-			cl.push_back("--path");
-			cl.push_back("game");
-		}
-
-		gen_export_flags(cl, p_flags);
-
-		// Command line file
-		Vector<uint8_t> clf;
-
-		// Argc
-		clf.resize(4);
-		encode_uint32(cl.size(), clf.ptrw());
-
-		for (int i = 0; i < cl.size(); i++) {
-			CharString txt = cl[i].utf8();
-			int base = clf.size();
-			clf.resize(base + 4 + txt.length());
-			encode_uint32(txt.length(), &clf.write[base]);
-			memcpy(&clf.write[base + 4], txt.ptr(), txt.length());
-			print_line(itos(i) + " param: " + cl[i]);
-		}
-
-		err = packager.add_file("__cl__.cl", clf.ptr(), clf.size(), -1, -1, false);
-		if (err != OK) {
-			return err;
-		}
-
-		if (ep.step("Adding project files...", 3)) {
-			return ERR_SKIP;
-		}
-
-		EditorNode::progress_add_task("project_files", "Project Files", 100);
-		packager.set_progress_task("project_files");
-
-		err = export_project_files(p_preset, save_appx_file, &packager);
-
-		EditorNode::progress_end_task("project_files");
-
-		if (ep.step("Closing package...", 7)) {
-			return ERR_SKIP;
-		}
-
-		unzClose(pkg);
-
-		packager.finish();
-
-#ifdef WINDOWS_ENABLED
-		// Sign with signtool
-		String signtool_path = EditorSettings::get_singleton()->get("export/uwp/signtool");
-		if (signtool_path == String()) {
-			return OK;
-		}
-
-		if (!FileAccess::exists(signtool_path)) {
-			ERR_PRINT("Could not find signtool executable at " + signtool_path + ", aborting.");
-			return ERR_FILE_NOT_FOUND;
-		}
-
-		static String algs[] = { "MD5", "SHA1", "SHA256" };
-
-		String cert_path = EditorSettings::get_singleton()->get("export/uwp/debug_certificate");
-		String cert_pass = EditorSettings::get_singleton()->get("export/uwp/debug_password");
-		int cert_alg = EditorSettings::get_singleton()->get("export/uwp/debug_algorithm");
-
-		if (!p_debug) {
-			cert_path = p_preset->get("signing/certificate");
-			cert_pass = p_preset->get("signing/password");
-			cert_alg = p_preset->get("signing/algorithm");
-		}
-
-		if (cert_path == String()) {
-			return OK; // Certificate missing, don't try to sign
-		}
-
-		if (!FileAccess::exists(cert_path)) {
-			ERR_PRINT("Could not find certificate file at " + cert_path + ", aborting.");
-			return ERR_FILE_NOT_FOUND;
-		}
-
-		if (cert_alg < 0 || cert_alg > 2) {
-			ERR_PRINT("Invalid certificate algorithm " + itos(cert_alg) + ", aborting.");
-			return ERR_INVALID_DATA;
-		}
-
-		List<String> args;
-		args.push_back("sign");
-		args.push_back("/fd");
-		args.push_back(algs[cert_alg]);
-		args.push_back("/a");
-		args.push_back("/f");
-		args.push_back(cert_path);
-		args.push_back("/p");
-		args.push_back(cert_pass);
-		args.push_back(p_path);
-
-		OS::get_singleton()->execute(signtool_path, args);
-#endif // WINDOWS_ENABLED
-
-		return OK;
-	}
-
-	virtual void get_platform_features(List<String> *r_features) override {
-		r_features->push_back("pc");
-		r_features->push_back("UWP");
-	}
-
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
-	}
-
-	EditorExportPlatformUWP() {
-		Ref<Image> img = memnew(Image(_uwp_logo));
-		logo.instantiate();
-		logo->create_from_image(img);
-	}
-};
+#include "export_plugin.h"
 
 void register_uwp_exporter() {
 #ifdef WINDOWS_ENABLED
diff --git a/platform/uwp/export/export_plugin.cpp b/platform/uwp/export/export_plugin.cpp
new file mode 100644
index 0000000000..5bd00b1549
--- /dev/null
+++ b/platform/uwp/export/export_plugin.cpp
@@ -0,0 +1,498 @@
+/*************************************************************************/
+/*  export_plugin.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "export_plugin.h"
+
+#include "platform/uwp/logo.gen.h"
+
+String EditorExportPlatformUWP::get_name() const {
+	return "UWP";
+}
+String EditorExportPlatformUWP::get_os_name() const {
+	return "UWP";
+}
+
+List<String> EditorExportPlatformUWP::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {
+	List<String> list;
+	list.push_back("appx");
+	return list;
+}
+
+Ref<Texture2D> EditorExportPlatformUWP::get_logo() const {
+	return logo;
+}
+
+void EditorExportPlatformUWP::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
+	r_features->push_back("s3tc");
+	r_features->push_back("etc");
+	switch ((int)p_preset->get("architecture/target")) {
+		case EditorExportPlatformUWP::ARM: {
+			r_features->push_back("arm");
+		} break;
+		case EditorExportPlatformUWP::X86: {
+			r_features->push_back("32");
+		} break;
+		case EditorExportPlatformUWP::X64: {
+			r_features->push_back("64");
+		} break;
+	}
+}
+
+void EditorExportPlatformUWP::get_export_options(List<ExportOption> *r_options) {
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "architecture/target", PROPERTY_HINT_ENUM, "arm,x86,x64"), 1));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "command_line/extra_args"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/display_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/short_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/unique_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game.Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/description"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/publisher", PROPERTY_HINT_PLACEHOLDER_TEXT, "CN=CompanyName"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/publisher_display_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Company Name"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "identity/product_guid", PROPERTY_HINT_PLACEHOLDER_TEXT, "00000000-0000-0000-0000-000000000000"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "identity/publisher_guid", PROPERTY_HINT_PLACEHOLDER_TEXT, "00000000-0000-0000-0000-000000000000"), ""));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "signing/certificate", PROPERTY_HINT_GLOBAL_FILE, "*.pfx"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "signing/password"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "signing/algorithm", PROPERTY_HINT_ENUM, "MD5,SHA1,SHA256"), 2));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/major"), 1));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/minor"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/build"), 0));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "version/revision"), 0));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/landscape"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/portrait"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/landscape_flipped"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/portrait_flipped"), true));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "images/background_color"), "transparent"));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/store_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square44x44_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square71x71_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square150x150_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/square310x310_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/wide310x150_logo", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::OBJECT, "images/splash_screen", PROPERTY_HINT_RESOURCE_TYPE, "StreamTexture2D"), Variant()));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "tiles/show_name_on_square150x150"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "tiles/show_name_on_wide310x150"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "tiles/show_name_on_square310x310"), false));
+
+	// Capabilities
+	const char **basic = uwp_capabilities;
+	while (*basic) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*basic)), false));
+		basic++;
+	}
+
+	const char **uap = uwp_uap_capabilities;
+	while (*uap) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*uap)), false));
+		uap++;
+	}
+
+	const char **device = uwp_device_capabilities;
+	while (*device) {
+		r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/" + String(*device)), false));
+		device++;
+	}
+}
+
+bool EditorExportPlatformUWP::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
+	String err;
+	bool valid = false;
+
+	// Look for export templates (first official, and if defined custom templates).
+
+	Platform arch = (Platform)(int)(p_preset->get("architecture/target"));
+	String platform_infix;
+	switch (arch) {
+		case EditorExportPlatformUWP::ARM: {
+			platform_infix = "arm";
+		} break;
+		case EditorExportPlatformUWP::X86: {
+			platform_infix = "x86";
+		} break;
+		case EditorExportPlatformUWP::X64: {
+			platform_infix = "x64";
+		} break;
+	}
+
+	bool dvalid = exists_export_template("uwp_" + platform_infix + "_debug.zip", &err);
+	bool rvalid = exists_export_template("uwp_" + platform_infix + "_release.zip", &err);
+
+	if (p_preset->get("custom_template/debug") != "") {
+		dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
+		if (!dvalid) {
+			err += TTR("Custom debug template not found.") + "\n";
+		}
+	}
+	if (p_preset->get("custom_template/release") != "") {
+		rvalid = FileAccess::exists(p_preset->get("custom_template/release"));
+		if (!rvalid) {
+			err += TTR("Custom release template not found.") + "\n";
+		}
+	}
+
+	valid = dvalid || rvalid;
+	r_missing_templates = !valid;
+
+	// Validate the rest of the configuration.
+
+	if (!_valid_resource_name(p_preset->get("package/short_name"))) {
+		valid = false;
+		err += TTR("Invalid package short name.") + "\n";
+	}
+
+	if (!_valid_resource_name(p_preset->get("package/unique_name"))) {
+		valid = false;
+		err += TTR("Invalid package unique name.") + "\n";
+	}
+
+	if (!_valid_resource_name(p_preset->get("package/publisher_display_name"))) {
+		valid = false;
+		err += TTR("Invalid package publisher display name.") + "\n";
+	}
+
+	if (!_valid_guid(p_preset->get("identity/product_guid"))) {
+		valid = false;
+		err += TTR("Invalid product GUID.") + "\n";
+	}
+
+	if (!_valid_guid(p_preset->get("identity/publisher_guid"))) {
+		valid = false;
+		err += TTR("Invalid publisher GUID.") + "\n";
+	}
+
+	if (!_valid_bgcolor(p_preset->get("images/background_color"))) {
+		valid = false;
+		err += TTR("Invalid background color.") + "\n";
+	}
+
+	if (!p_preset->get("images/store_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/store_logo"))), 50, 50)) {
+		valid = false;
+		err += TTR("Invalid Store Logo image dimensions (should be 50x50).") + "\n";
+	}
+
+	if (!p_preset->get("images/square44x44_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square44x44_logo"))), 44, 44)) {
+		valid = false;
+		err += TTR("Invalid square 44x44 logo image dimensions (should be 44x44).") + "\n";
+	}
+
+	if (!p_preset->get("images/square71x71_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square71x71_logo"))), 71, 71)) {
+		valid = false;
+		err += TTR("Invalid square 71x71 logo image dimensions (should be 71x71).") + "\n";
+	}
+
+	if (!p_preset->get("images/square150x150_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square150x150_logo"))), 150, 150)) {
+		valid = false;
+		err += TTR("Invalid square 150x150 logo image dimensions (should be 150x150).") + "\n";
+	}
+
+	if (!p_preset->get("images/square310x310_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/square310x310_logo"))), 310, 310)) {
+		valid = false;
+		err += TTR("Invalid square 310x310 logo image dimensions (should be 310x310).") + "\n";
+	}
+
+	if (!p_preset->get("images/wide310x150_logo").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/wide310x150_logo"))), 310, 150)) {
+		valid = false;
+		err += TTR("Invalid wide 310x150 logo image dimensions (should be 310x150).") + "\n";
+	}
+
+	if (!p_preset->get("images/splash_screen").is_zero() && !_valid_image((Object::cast_to<StreamTexture2D>((Object *)p_preset->get("images/splash_screen"))), 620, 300)) {
+		valid = false;
+		err += TTR("Invalid splash screen image dimensions (should be 620x300).") + "\n";
+	}
+
+	r_error = err;
+	return valid;
+}
+
+Error EditorExportPlatformUWP::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
+
+	String src_appx;
+
+	EditorProgress ep("export", "Exporting for UWP", 7, true);
+
+	if (p_debug) {
+		src_appx = p_preset->get("custom_template/debug");
+	} else {
+		src_appx = p_preset->get("custom_template/release");
+	}
+
+	src_appx = src_appx.strip_edges();
+
+	Platform arch = (Platform)(int)p_preset->get("architecture/target");
+
+	if (src_appx == "") {
+		String err, infix;
+		switch (arch) {
+			case ARM: {
+				infix = "_arm_";
+			} break;
+			case X86: {
+				infix = "_x86_";
+			} break;
+			case X64: {
+				infix = "_x64_";
+			} break;
+		}
+		if (p_debug) {
+			src_appx = find_export_template("uwp" + infix + "debug.zip", &err);
+		} else {
+			src_appx = find_export_template("uwp" + infix + "release.zip", &err);
+		}
+		if (src_appx == "") {
+			EditorNode::add_io_error(err);
+			return ERR_FILE_NOT_FOUND;
+		}
+	}
+
+	if (!DirAccess::exists(p_path.get_base_dir())) {
+		return ERR_FILE_BAD_PATH;
+	}
+
+	Error err = OK;
+
+	FileAccess *fa_pack = FileAccess::open(p_path, FileAccess::WRITE, &err);
+	ERR_FAIL_COND_V_MSG(err != OK, ERR_CANT_CREATE, "Cannot create file '" + p_path + "'.");
+
+	AppxPackager packager;
+	packager.init(fa_pack);
+
+	FileAccess *src_f = nullptr;
+	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
+
+	if (ep.step("Creating package...", 0)) {
+		return ERR_SKIP;
+	}
+
+	unzFile pkg = unzOpen2(src_appx.utf8().get_data(), &io);
+
+	if (!pkg) {
+		EditorNode::add_io_error("Could not find template appx to export:\n" + src_appx);
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	int ret = unzGoToFirstFile(pkg);
+
+	if (ep.step("Copying template files...", 1)) {
+		return ERR_SKIP;
+	}
+
+	EditorNode::progress_add_task("template_files", "Template files", 100);
+	packager.set_progress_task("template_files");
+
+	int template_files_amount = 9;
+	int template_file_no = 1;
+
+	while (ret == UNZ_OK) {
+		// get file name
+		unz_file_info info;
+		char fname[16834];
+		ret = unzGetCurrentFileInfo(pkg, &info, fname, 16834, nullptr, 0, nullptr, 0);
+
+		String path = fname;
+
+		if (path.ends_with("/")) {
+			// Ignore directories
+			ret = unzGoToNextFile(pkg);
+			continue;
+		}
+
+		Vector<uint8_t> data;
+		bool do_read = true;
+
+		if (path.begins_with("Assets/")) {
+			path = path.replace(".scale-100", "");
+
+			data = _get_image_data(p_preset, path);
+			if (data.size() > 0) {
+				do_read = false;
+			}
+		}
+
+		//read
+		if (do_read) {
+			data.resize(info.uncompressed_size);
+			unzOpenCurrentFile(pkg);
+			unzReadCurrentFile(pkg, data.ptrw(), data.size());
+			unzCloseCurrentFile(pkg);
+		}
+
+		if (path == "AppxManifest.xml") {
+			data = _fix_manifest(p_preset, data, p_flags & (DEBUG_FLAG_DUMB_CLIENT | DEBUG_FLAG_REMOTE_DEBUG));
+		}
+
+		print_line("ADDING: " + path);
+
+		err = packager.add_file(path, data.ptr(), data.size(), template_file_no++, template_files_amount, _should_compress_asset(path, data));
+		if (err != OK) {
+			return err;
+		}
+
+		ret = unzGoToNextFile(pkg);
+	}
+
+	EditorNode::progress_end_task("template_files");
+
+	if (ep.step("Creating command line...", 2)) {
+		return ERR_SKIP;
+	}
+
+	Vector<String> cl = ((String)p_preset->get("command_line/extra_args")).strip_edges().split(" ");
+	for (int i = 0; i < cl.size(); i++) {
+		if (cl[i].strip_edges().length() == 0) {
+			cl.remove(i);
+			i--;
+		}
+	}
+
+	if (!(p_flags & DEBUG_FLAG_DUMB_CLIENT)) {
+		cl.push_back("--path");
+		cl.push_back("game");
+	}
+
+	gen_export_flags(cl, p_flags);
+
+	// Command line file
+	Vector<uint8_t> clf;
+
+	// Argc
+	clf.resize(4);
+	encode_uint32(cl.size(), clf.ptrw());
+
+	for (int i = 0; i < cl.size(); i++) {
+		CharString txt = cl[i].utf8();
+		int base = clf.size();
+		clf.resize(base + 4 + txt.length());
+		encode_uint32(txt.length(), &clf.write[base]);
+		memcpy(&clf.write[base + 4], txt.ptr(), txt.length());
+		print_line(itos(i) + " param: " + cl[i]);
+	}
+
+	err = packager.add_file("__cl__.cl", clf.ptr(), clf.size(), -1, -1, false);
+	if (err != OK) {
+		return err;
+	}
+
+	if (ep.step("Adding project files...", 3)) {
+		return ERR_SKIP;
+	}
+
+	EditorNode::progress_add_task("project_files", "Project Files", 100);
+	packager.set_progress_task("project_files");
+
+	err = export_project_files(p_preset, save_appx_file, &packager);
+
+	EditorNode::progress_end_task("project_files");
+
+	if (ep.step("Closing package...", 7)) {
+		return ERR_SKIP;
+	}
+
+	unzClose(pkg);
+
+	packager.finish();
+
+#ifdef WINDOWS_ENABLED
+	// Sign with signtool
+	String signtool_path = EditorSettings::get_singleton()->get("export/uwp/signtool");
+	if (signtool_path == String()) {
+		return OK;
+	}
+
+	if (!FileAccess::exists(signtool_path)) {
+		ERR_PRINT("Could not find signtool executable at " + signtool_path + ", aborting.");
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	static String algs[] = { "MD5", "SHA1", "SHA256" };
+
+	String cert_path = EditorSettings::get_singleton()->get("export/uwp/debug_certificate");
+	String cert_pass = EditorSettings::get_singleton()->get("export/uwp/debug_password");
+	int cert_alg = EditorSettings::get_singleton()->get("export/uwp/debug_algorithm");
+
+	if (!p_debug) {
+		cert_path = p_preset->get("signing/certificate");
+		cert_pass = p_preset->get("signing/password");
+		cert_alg = p_preset->get("signing/algorithm");
+	}
+
+	if (cert_path == String()) {
+		return OK; // Certificate missing, don't try to sign
+	}
+
+	if (!FileAccess::exists(cert_path)) {
+		ERR_PRINT("Could not find certificate file at " + cert_path + ", aborting.");
+		return ERR_FILE_NOT_FOUND;
+	}
+
+	if (cert_alg < 0 || cert_alg > 2) {
+		ERR_PRINT("Invalid certificate algorithm " + itos(cert_alg) + ", aborting.");
+		return ERR_INVALID_DATA;
+	}
+
+	List<String> args;
+	args.push_back("sign");
+	args.push_back("/fd");
+	args.push_back(algs[cert_alg]);
+	args.push_back("/a");
+	args.push_back("/f");
+	args.push_back(cert_path);
+	args.push_back("/p");
+	args.push_back(cert_pass);
+	args.push_back(p_path);
+
+	OS::get_singleton()->execute(signtool_path, args);
+#endif // WINDOWS_ENABLED
+
+	return OK;
+}
+
+void EditorExportPlatformUWP::get_platform_features(List<String> *r_features) {
+	r_features->push_back("pc");
+	r_features->push_back("UWP");
+}
+
+void EditorExportPlatformUWP::resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) {
+}
+
+EditorExportPlatformUWP::EditorExportPlatformUWP() {
+	Ref<Image> img = memnew(Image(_uwp_logo));
+	logo.instantiate();
+	logo->create_from_image(img);
+}
diff --git a/platform/uwp/export/export_plugin.h b/platform/uwp/export/export_plugin.h
new file mode 100644
index 0000000000..f295789254
--- /dev/null
+++ b/platform/uwp/export/export_plugin.h
@@ -0,0 +1,448 @@
+/*************************************************************************/
+/*  export_plugin.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef UWP_EXPORT_PLUGIN_H
+#define UWP_EXPORT_PLUGIN_H
+
+#include "core/config/project_settings.h"
+#include "core/crypto/crypto_core.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/marshalls.h"
+#include "core/io/zip_io.h"
+#include "core/object/class_db.h"
+#include "core/version.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+
+#include "thirdparty/minizip/unzip.h"
+#include "thirdparty/minizip/zip.h"
+
+#include "app_packager.h"
+
+#include <zlib.h>
+
+// Capabilities
+static const char *uwp_capabilities[] = {
+	"allJoyn",
+	"codeGeneration",
+	"internetClient",
+	"internetClientServer",
+	"privateNetworkClientServer",
+	nullptr
+};
+static const char *uwp_uap_capabilities[] = {
+	"appointments",
+	"blockedChatMessages",
+	"chat",
+	"contacts",
+	"enterpriseAuthentication",
+	"musicLibrary",
+	"objects3D",
+	"picturesLibrary",
+	"phoneCall",
+	"removableStorage",
+	"sharedUserCertificates",
+	"userAccountInformation",
+	"videosLibrary",
+	"voipCall",
+	nullptr
+};
+static const char *uwp_device_capabilities[] = {
+	"bluetooth",
+	"location",
+	"microphone",
+	"proximity",
+	"webcam",
+	nullptr
+};
+
+class EditorExportPlatformUWP : public EditorExportPlatform {
+	GDCLASS(EditorExportPlatformUWP, EditorExportPlatform);
+
+	Ref<ImageTexture> logo;
+
+	enum Platform {
+		ARM,
+		X86,
+		X64
+	};
+
+	bool _valid_resource_name(const String &p_name) const {
+		if (p_name.is_empty()) {
+			return false;
+		}
+		if (p_name.ends_with(".")) {
+			return false;
+		}
+
+		static const char *invalid_names[] = {
+			"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7",
+			"COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
+			nullptr
+		};
+
+		const char **t = invalid_names;
+		while (*t) {
+			if (p_name == *t) {
+				return false;
+			}
+			t++;
+		}
+
+		return true;
+	}
+
+	bool _valid_guid(const String &p_guid) const {
+		Vector<String> parts = p_guid.split("-");
+
+		if (parts.size() != 5) {
+			return false;
+		}
+		if (parts[0].length() != 8) {
+			return false;
+		}
+		for (int i = 1; i < 4; i++) {
+			if (parts[i].length() != 4) {
+				return false;
+			}
+		}
+		if (parts[4].length() != 12) {
+			return false;
+		}
+
+		return true;
+	}
+
+	bool _valid_bgcolor(const String &p_color) const {
+		if (p_color.is_empty()) {
+			return true;
+		}
+		if (p_color.begins_with("#") && p_color.is_valid_html_color()) {
+			return true;
+		}
+
+		// Colors from https://msdn.microsoft.com/en-us/library/windows/apps/dn934817.aspx
+		static const char *valid_colors[] = {
+			"aliceBlue", "antiqueWhite", "aqua", "aquamarine", "azure", "beige",
+			"bisque", "black", "blanchedAlmond", "blue", "blueViolet", "brown",
+			"burlyWood", "cadetBlue", "chartreuse", "chocolate", "coral", "cornflowerBlue",
+			"cornsilk", "crimson", "cyan", "darkBlue", "darkCyan", "darkGoldenrod",
+			"darkGray", "darkGreen", "darkKhaki", "darkMagenta", "darkOliveGreen", "darkOrange",
+			"darkOrchid", "darkRed", "darkSalmon", "darkSeaGreen", "darkSlateBlue", "darkSlateGray",
+			"darkTurquoise", "darkViolet", "deepPink", "deepSkyBlue", "dimGray", "dodgerBlue",
+			"firebrick", "floralWhite", "forestGreen", "fuchsia", "gainsboro", "ghostWhite",
+			"gold", "goldenrod", "gray", "green", "greenYellow", "honeydew",
+			"hotPink", "indianRed", "indigo", "ivory", "khaki", "lavender",
+			"lavenderBlush", "lawnGreen", "lemonChiffon", "lightBlue", "lightCoral", "lightCyan",
+			"lightGoldenrodYellow", "lightGreen", "lightGray", "lightPink", "lightSalmon", "lightSeaGreen",
+			"lightSkyBlue", "lightSlateGray", "lightSteelBlue", "lightYellow", "lime", "limeGreen",
+			"linen", "magenta", "maroon", "mediumAquamarine", "mediumBlue", "mediumOrchid",
+			"mediumPurple", "mediumSeaGreen", "mediumSlateBlue", "mediumSpringGreen", "mediumTurquoise", "mediumVioletRed",
+			"midnightBlue", "mintCream", "mistyRose", "moccasin", "navajoWhite", "navy",
+			"oldLace", "olive", "oliveDrab", "orange", "orangeRed", "orchid",
+			"paleGoldenrod", "paleGreen", "paleTurquoise", "paleVioletRed", "papayaWhip", "peachPuff",
+			"peru", "pink", "plum", "powderBlue", "purple", "red",
+			"rosyBrown", "royalBlue", "saddleBrown", "salmon", "sandyBrown", "seaGreen",
+			"seaShell", "sienna", "silver", "skyBlue", "slateBlue", "slateGray",
+			"snow", "springGreen", "steelBlue", "tan", "teal", "thistle",
+			"tomato", "transparent", "turquoise", "violet", "wheat", "white",
+			"whiteSmoke", "yellow", "yellowGreen",
+			nullptr
+		};
+
+		const char **color = valid_colors;
+
+		while (*color) {
+			if (p_color == *color) {
+				return true;
+			}
+			color++;
+		}
+
+		return false;
+	}
+
+	bool _valid_image(const StreamTexture2D *p_image, int p_width, int p_height) const {
+		if (!p_image) {
+			return false;
+		}
+
+		// TODO: Add resource creation or image rescaling to enable other scales:
+		// 1.25, 1.5, 2.0
+		return p_width == p_image->get_width() && p_height == p_image->get_height();
+	}
+
+	Vector<uint8_t> _fix_manifest(const Ref<EditorExportPreset> &p_preset, const Vector<uint8_t> &p_template, bool p_give_internet) const {
+		String result = String::utf8((const char *)p_template.ptr(), p_template.size());
+
+		result = result.replace("$godot_version$", VERSION_FULL_NAME);
+
+		result = result.replace("$identity_name$", p_preset->get("package/unique_name"));
+		result = result.replace("$publisher$", p_preset->get("package/publisher"));
+
+		result = result.replace("$product_guid$", p_preset->get("identity/product_guid"));
+		result = result.replace("$publisher_guid$", p_preset->get("identity/publisher_guid"));
+
+		String version = itos(p_preset->get("version/major")) + "." + itos(p_preset->get("version/minor")) + "." + itos(p_preset->get("version/build")) + "." + itos(p_preset->get("version/revision"));
+		result = result.replace("$version_string$", version);
+
+		Platform arch = (Platform)(int)p_preset->get("architecture/target");
+		String architecture = arch == ARM ? "arm" : (arch == X86 ? "x86" : "x64");
+		result = result.replace("$architecture$", architecture);
+
+		result = result.replace("$display_name$", String(p_preset->get("package/display_name")).is_empty() ? (String)ProjectSettings::get_singleton()->get("application/config/name") : String(p_preset->get("package/display_name")));
+
+		result = result.replace("$publisher_display_name$", p_preset->get("package/publisher_display_name"));
+		result = result.replace("$app_description$", p_preset->get("package/description"));
+		result = result.replace("$bg_color$", p_preset->get("images/background_color"));
+		result = result.replace("$short_name$", p_preset->get("package/short_name"));
+
+		String name_on_tiles = "";
+		if ((bool)p_preset->get("tiles/show_name_on_square150x150")) {
+			name_on_tiles += "          <uap:ShowOn Tile=\"square150x150Logo\" />\n";
+		}
+		if ((bool)p_preset->get("tiles/show_name_on_wide310x150")) {
+			name_on_tiles += "          <uap:ShowOn Tile=\"wide310x150Logo\" />\n";
+		}
+		if ((bool)p_preset->get("tiles/show_name_on_square310x310")) {
+			name_on_tiles += "          <uap:ShowOn Tile=\"square310x310Logo\" />\n";
+		}
+
+		String show_name_on_tiles = "";
+		if (!name_on_tiles.is_empty()) {
+			show_name_on_tiles = "<uap:ShowNameOnTiles>\n" + name_on_tiles + "        </uap:ShowNameOnTiles>";
+		}
+
+		result = result.replace("$name_on_tiles$", name_on_tiles);
+
+		String rotations = "";
+		if ((bool)p_preset->get("orientation/landscape")) {
+			rotations += "          <uap:Rotation Preference=\"landscape\" />\n";
+		}
+		if ((bool)p_preset->get("orientation/portrait")) {
+			rotations += "          <uap:Rotation Preference=\"portrait\" />\n";
+		}
+		if ((bool)p_preset->get("orientation/landscape_flipped")) {
+			rotations += "          <uap:Rotation Preference=\"landscapeFlipped\" />\n";
+		}
+		if ((bool)p_preset->get("orientation/portrait_flipped")) {
+			rotations += "          <uap:Rotation Preference=\"portraitFlipped\" />\n";
+		}
+
+		String rotation_preference = "";
+		if (!rotations.is_empty()) {
+			rotation_preference = "<uap:InitialRotationPreference>\n" + rotations + "        </uap:InitialRotationPreference>";
+		}
+
+		result = result.replace("$rotation_preference$", rotation_preference);
+
+		String capabilities_elements = "";
+		const char **basic = uwp_capabilities;
+		while (*basic) {
+			if ((bool)p_preset->get("capabilities/" + String(*basic))) {
+				capabilities_elements += "    <Capability Name=\"" + String(*basic) + "\" />\n";
+			}
+			basic++;
+		}
+		const char **uap = uwp_uap_capabilities;
+		while (*uap) {
+			if ((bool)p_preset->get("capabilities/" + String(*uap))) {
+				capabilities_elements += "    <uap:Capability Name=\"" + String(*uap) + "\" />\n";
+			}
+			uap++;
+		}
+		const char **device = uwp_device_capabilities;
+		while (*device) {
+			if ((bool)p_preset->get("capabilities/" + String(*device))) {
+				capabilities_elements += "    <DeviceCapability Name=\"" + String(*device) + "\" />\n";
+			}
+			device++;
+		}
+
+		if (!((bool)p_preset->get("capabilities/internetClient")) && p_give_internet) {
+			capabilities_elements += "    <Capability Name=\"internetClient\" />\n";
+		}
+
+		String capabilities_string = "<Capabilities />";
+		if (!capabilities_elements.is_empty()) {
+			capabilities_string = "<Capabilities>\n" + capabilities_elements + "  </Capabilities>";
+		}
+
+		result = result.replace("$capabilities_place$", capabilities_string);
+
+		Vector<uint8_t> r_ret;
+		r_ret.resize(result.length());
+
+		for (int i = 0; i < result.length(); i++) {
+			r_ret.write[i] = result.utf8().get(i);
+		}
+
+		return r_ret;
+	}
+
+	Vector<uint8_t> _get_image_data(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
+		Vector<uint8_t> data;
+		StreamTexture2D *texture = nullptr;
+
+		if (p_path.find("StoreLogo") != -1) {
+			texture = p_preset->get("images/store_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/store_logo")));
+		} else if (p_path.find("Square44x44Logo") != -1) {
+			texture = p_preset->get("images/square44x44_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square44x44_logo")));
+		} else if (p_path.find("Square71x71Logo") != -1) {
+			texture = p_preset->get("images/square71x71_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square71x71_logo")));
+		} else if (p_path.find("Square150x150Logo") != -1) {
+			texture = p_preset->get("images/square150x150_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square150x150_logo")));
+		} else if (p_path.find("Square310x310Logo") != -1) {
+			texture = p_preset->get("images/square310x310_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/square310x310_logo")));
+		} else if (p_path.find("Wide310x150Logo") != -1) {
+			texture = p_preset->get("images/wide310x150_logo").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/wide310x150_logo")));
+		} else if (p_path.find("SplashScreen") != -1) {
+			texture = p_preset->get("images/splash_screen").is_zero() ? nullptr : Object::cast_to<StreamTexture2D>(((Object *)p_preset->get("images/splash_screen")));
+		} else {
+			ERR_PRINT("Unable to load logo");
+		}
+
+		if (!texture) {
+			return data;
+		}
+
+		String tmp_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("uwp_tmp_logo.png");
+
+		Error err = texture->get_image()->save_png(tmp_path);
+
+		if (err != OK) {
+			String err_string = "Couldn't save temp logo file.";
+
+			EditorNode::add_io_error(err_string);
+			ERR_FAIL_V_MSG(data, err_string);
+		}
+
+		FileAccess *f = FileAccess::open(tmp_path, FileAccess::READ, &err);
+
+		if (err != OK) {
+			String err_string = "Couldn't open temp logo file.";
+			// Cleanup generated file.
+			DirAccess::remove_file_or_error(tmp_path);
+			EditorNode::add_io_error(err_string);
+			ERR_FAIL_V_MSG(data, err_string);
+		}
+
+		data.resize(f->get_length());
+		f->get_buffer(data.ptrw(), data.size());
+
+		f->close();
+		memdelete(f);
+		DirAccess::remove_file_or_error(tmp_path);
+
+		return data;
+	}
+
+	static bool _should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data) {
+		/* TODO: This was copied verbatim from Android export. It should be
+    * refactored to the parent class and also be used for .zip export.
+    */
+
+		/*
+    *  By not compressing files with little or not benefit in doing so,
+    *  a performance gain is expected at runtime. Moreover, if the APK is
+    *  zip-aligned, assets stored as they are can be efficiently read by
+    *  Android by memory-mapping them.
+    */
+
+		// -- Unconditional uncompress to mimic AAPT plus some other
+
+		static const char *unconditional_compress_ext[] = {
+			// From https://github.com/android/platform_frameworks_base/blob/master/tools/aapt/Package.cpp
+			// These formats are already compressed, or don't compress well:
+			".jpg", ".jpeg", ".png", ".gif",
+			".wav", ".mp2", ".mp3", ".ogg", ".aac",
+			".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet",
+			".rtttl", ".imy", ".xmf", ".mp4", ".m4a",
+			".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2",
+			".amr", ".awb", ".wma", ".wmv",
+			// Godot-specific:
+			".webp", // Same reasoning as .png
+			".cfb", // Don't let small config files slow-down startup
+			".scn", // Binary scenes are usually already compressed
+			".stex", // Streamable textures are usually already compressed
+			// Trailer for easier processing
+			nullptr
+		};
+
+		for (const char **ext = unconditional_compress_ext; *ext; ++ext) {
+			if (p_path.to_lower().ends_with(String(*ext))) {
+				return false;
+			}
+		}
+
+		// -- Compressed resource?
+
+		if (p_data.size() >= 4 && p_data[0] == 'R' && p_data[1] == 'S' && p_data[2] == 'C' && p_data[3] == 'C') {
+			// Already compressed
+			return false;
+		}
+
+		// --- TODO: Decide on texture resources according to their image compression setting
+
+		return true;
+	}
+
+	static Error save_appx_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) {
+		AppxPackager *packager = (AppxPackager *)p_userdata;
+		String dst_path = p_path.replace_first("res://", "game/");
+
+		return packager->add_file(dst_path, p_data.ptr(), p_data.size(), p_file, p_total, _should_compress_asset(p_path, p_data));
+	}
+
+public:
+	virtual String get_name() const override;
+	virtual String get_os_name() const override;
+
+	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
+
+	virtual Ref<Texture2D> get_logo() const override;
+
+	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
+
+	virtual void get_export_options(List<ExportOption> *r_options) override;
+
+	virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override;
+
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override;
+
+	virtual void get_platform_features(List<String> *r_features) override;
+
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override;
+
+	EditorExportPlatformUWP();
+};
+
+#endif
diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp
index 10f953f2ec..4ff42f3f62 100644
--- a/platform/windows/export/export.cpp
+++ b/platform/windows/export/export.cpp
@@ -28,316 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/io/file_access.h"
-#include "core/os/os.h"
-#include "editor/editor_export.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "platform/windows/logo.gen.h"
+#include "export.h"
 
-static Error fixup_embedded_pck(const String &p_path, int64_t p_embedded_start, int64_t p_embedded_size);
-
-class EditorExportPlatformWindows : public EditorExportPlatformPC {
-	void _rcedit_add_data(const Ref<EditorExportPreset> &p_preset, const String &p_path);
-	Error _code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path);
-
-public:
-	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0);
-	virtual Error sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path);
-	virtual void get_export_options(List<ExportOption> *r_options);
-};
-
-Error EditorExportPlatformWindows::sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path) {
-	if (p_preset->get("codesign/enable")) {
-		return _code_sign(p_preset, p_path);
-	} else {
-		return OK;
-	}
-}
-
-Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
-	Error err = EditorExportPlatformPC::export_project(p_preset, p_debug, p_path, p_flags);
-
-	if (err != OK) {
-		return err;
-	}
-
-	_rcedit_add_data(p_preset, p_path);
-
-	if (p_preset->get("codesign/enable") && err == OK) {
-		err = _code_sign(p_preset, p_path);
-	}
-
-	return err;
-}
-
-void EditorExportPlatformWindows::get_export_options(List<ExportOption> *r_options) {
-	EditorExportPlatformPC::get_export_options(r_options);
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/enable"), false));
-#ifdef WINDOWS_ENABLED
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/identity_type", PROPERTY_HINT_ENUM, "Select automatically,Use PKCS12 file (specify *.PFX/*.P12 file),Use certificate store (specify SHA1 hash)"), 0));
-#endif
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/identity", PROPERTY_HINT_GLOBAL_FILE, "*.pfx,*.p12"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/password"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/timestamp"), true));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/timestamp_server_url"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/digest_algorithm", PROPERTY_HINT_ENUM, "SHA1,SHA256"), 1));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/description"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "codesign/custom_options"), PackedStringArray()));
-
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.ico"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/file_version", PROPERTY_HINT_PLACEHOLDER_TEXT, "1.0.0"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/product_version", PROPERTY_HINT_PLACEHOLDER_TEXT, "1.0.0"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/company_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Company Name"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/product_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/file_description"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
-	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/trademarks"), ""));
-}
-
-void EditorExportPlatformWindows::_rcedit_add_data(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
-	String rcedit_path = EditorSettings::get_singleton()->get("export/windows/rcedit");
-
-	if (rcedit_path == String()) {
-		return;
-	}
-
-	if (!FileAccess::exists(rcedit_path)) {
-		ERR_PRINT("Could not find rcedit executable at " + rcedit_path + ", no icon or app information data will be included.");
-		return;
-	}
-
-#ifndef WINDOWS_ENABLED
-	// On non-Windows we need WINE to run rcedit
-	String wine_path = EditorSettings::get_singleton()->get("export/windows/wine");
-
-	if (wine_path != String() && !FileAccess::exists(wine_path)) {
-		ERR_PRINT("Could not find wine executable at " + wine_path + ", no icon or app information data will be included.");
-		return;
-	}
-
-	if (wine_path == String()) {
-		wine_path = "wine"; // try to run wine from PATH
-	}
-#endif
-
-	String icon_path = ProjectSettings::get_singleton()->globalize_path(p_preset->get("application/icon"));
-	String file_verion = p_preset->get("application/file_version");
-	String product_version = p_preset->get("application/product_version");
-	String company_name = p_preset->get("application/company_name");
-	String product_name = p_preset->get("application/product_name");
-	String file_description = p_preset->get("application/file_description");
-	String copyright = p_preset->get("application/copyright");
-	String trademarks = p_preset->get("application/trademarks");
-	String comments = p_preset->get("application/comments");
-
-	List<String> args;
-	args.push_back(p_path);
-	if (icon_path != String()) {
-		args.push_back("--set-icon");
-		args.push_back(icon_path);
-	}
-	if (file_verion != String()) {
-		args.push_back("--set-file-version");
-		args.push_back(file_verion);
-	}
-	if (product_version != String()) {
-		args.push_back("--set-product-version");
-		args.push_back(product_version);
-	}
-	if (company_name != String()) {
-		args.push_back("--set-version-string");
-		args.push_back("CompanyName");
-		args.push_back(company_name);
-	}
-	if (product_name != String()) {
-		args.push_back("--set-version-string");
-		args.push_back("ProductName");
-		args.push_back(product_name);
-	}
-	if (file_description != String()) {
-		args.push_back("--set-version-string");
-		args.push_back("FileDescription");
-		args.push_back(file_description);
-	}
-	if (copyright != String()) {
-		args.push_back("--set-version-string");
-		args.push_back("LegalCopyright");
-		args.push_back(copyright);
-	}
-	if (trademarks != String()) {
-		args.push_back("--set-version-string");
-		args.push_back("LegalTrademarks");
-		args.push_back(trademarks);
-	}
-
-#ifdef WINDOWS_ENABLED
-	OS::get_singleton()->execute(rcedit_path, args);
-#else
-	// On non-Windows we need WINE to run rcedit
-	args.push_front(rcedit_path);
-	OS::get_singleton()->execute(wine_path, args);
-#endif
-}
-
-Error EditorExportPlatformWindows::_code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
-	List<String> args;
-
-#ifdef WINDOWS_ENABLED
-	String signtool_path = EditorSettings::get_singleton()->get("export/windows/signtool");
-	if (signtool_path != String() && !FileAccess::exists(signtool_path)) {
-		ERR_PRINT("Could not find signtool executable at " + signtool_path + ", aborting.");
-		return ERR_FILE_NOT_FOUND;
-	}
-	if (signtool_path == String()) {
-		signtool_path = "signtool"; // try to run signtool from PATH
-	}
-#else
-	String signtool_path = EditorSettings::get_singleton()->get("export/windows/osslsigncode");
-	if (signtool_path != String() && !FileAccess::exists(signtool_path)) {
-		ERR_PRINT("Could not find osslsigncode executable at " + signtool_path + ", aborting.");
-		return ERR_FILE_NOT_FOUND;
-	}
-	if (signtool_path == String()) {
-		signtool_path = "osslsigncode"; // try to run signtool from PATH
-	}
-#endif
-
-	args.push_back("sign");
-
-	//identity
-#ifdef WINDOWS_ENABLED
-	int id_type = p_preset->get("codesign/identity_type");
-	if (id_type == 0) { //auto select
-		args.push_back("/a");
-	} else if (id_type == 1) { //pkcs12
-		if (p_preset->get("codesign/identity") != "") {
-			args.push_back("/f");
-			args.push_back(p_preset->get("codesign/identity"));
-		} else {
-			EditorNode::add_io_error("codesign: no identity found");
-			return FAILED;
-		}
-	} else if (id_type == 2) { //Windows certificate store
-		if (p_preset->get("codesign/identity") != "") {
-			args.push_back("/sha1");
-			args.push_back(p_preset->get("codesign/identity"));
-		} else {
-			EditorNode::add_io_error("codesign: no identity found");
-			return FAILED;
-		}
-	} else {
-		EditorNode::add_io_error("codesign: invalid identity type");
-		return FAILED;
-	}
-#else
-	if (p_preset->get("codesign/identity") != "") {
-		args.push_back("-pkcs12");
-		args.push_back(p_preset->get("codesign/identity"));
-	} else {
-		EditorNode::add_io_error("codesign: no identity found");
-		return FAILED;
-	}
-#endif
-
-	//password
-	if (p_preset->get("codesign/password") != "") {
-#ifdef WINDOWS_ENABLED
-		args.push_back("/p");
-#else
-		args.push_back("-pass");
-#endif
-		args.push_back(p_preset->get("codesign/password"));
-	}
-
-	//timestamp
-	if (p_preset->get("codesign/timestamp")) {
-		if (p_preset->get("codesign/timestamp_server") != "") {
-#ifdef WINDOWS_ENABLED
-			args.push_back("/tr");
-			args.push_back(p_preset->get("codesign/timestamp_server_url"));
-			args.push_back("/td");
-			if ((int)p_preset->get("codesign/digest_algorithm") == 0) {
-				args.push_back("sha1");
-			} else {
-				args.push_back("sha256");
-			}
-#else
-			args.push_back("-ts");
-			args.push_back(p_preset->get("codesign/timestamp_server_url"));
-#endif
-		} else {
-			EditorNode::add_io_error("codesign: invalid timestamp server");
-			return FAILED;
-		}
-	}
-
-	//digest
-#ifdef WINDOWS_ENABLED
-	args.push_back("/fd");
-#else
-	args.push_back("-h");
-#endif
-	if ((int)p_preset->get("codesign/digest_algorithm") == 0) {
-		args.push_back("sha1");
-	} else {
-		args.push_back("sha256");
-	}
-
-	//description
-	if (p_preset->get("codesign/description") != "") {
-#ifdef WINDOWS_ENABLED
-		args.push_back("/d");
-#else
-		args.push_back("-n");
-#endif
-		args.push_back(p_preset->get("codesign/description"));
-	}
-
-	//user options
-	PackedStringArray user_args = p_preset->get("codesign/custom_options");
-	for (int i = 0; i < user_args.size(); i++) {
-		String user_arg = user_args[i].strip_edges();
-		if (!user_arg.is_empty()) {
-			args.push_back(user_arg);
-		}
-	}
-
-#ifndef WINDOWS_ENABLED
-	args.push_back("-in");
-#endif
-	args.push_back(p_path);
-#ifndef WINDOWS_ENABLED
-	args.push_back("-out");
-	args.push_back(p_path + "_signed");
-#endif
-
-	String str;
-	Error err = OS::get_singleton()->execute(signtool_path, args, &str, nullptr, true);
-	ERR_FAIL_COND_V(err != OK, err);
-
-	print_line("codesign (" + p_path + "): " + str);
-#ifndef WINDOWS_ENABLED
-	if (str.find("SignTool Error") != -1) {
-#else
-	if (str.find("Failed") != -1) {
-#endif
-		return FAILED;
-	}
+#include "export_plugin.h"
 
-#ifndef WINDOWS_ENABLED
-	DirAccessRef tmp_dir = DirAccess::create_for_path(p_path.get_base_dir());
-
-	err = tmp_dir->remove(p_path);
-	ERR_FAIL_COND_V(err != OK, err);
-
-	err = tmp_dir->rename(p_path + "_signed", p_path);
-	ERR_FAIL_COND_V(err != OK, err);
-#endif
-
-	return OK;
-}
+static Error fixup_embedded_pck(const String &p_path, int64_t p_embedded_start, int64_t p_embedded_size);
 
 void register_windows_exporter() {
 	EDITOR_DEF("export/windows/rcedit", "");
diff --git a/platform/windows/export/export.h b/platform/windows/export/export.h
index 6a7131c73f..110e1439e2 100644
--- a/platform/windows/export/export.h
+++ b/platform/windows/export/export.h
@@ -28,4 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef WINDOWS_EXPORT_H
+#define WINDOWS_EXPORT_H
+
 void register_windows_exporter();
+
+#endif
diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp
new file mode 100644
index 0000000000..165e86c066
--- /dev/null
+++ b/platform/windows/export/export_plugin.cpp
@@ -0,0 +1,323 @@
+/*************************************************************************/
+/*  export_plugin.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "export_plugin.h"
+
+Error EditorExportPlatformWindows::sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path) {
+	if (p_preset->get("codesign/enable")) {
+		return _code_sign(p_preset, p_path);
+	} else {
+		return OK;
+	}
+}
+
+Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+	Error err = EditorExportPlatformPC::export_project(p_preset, p_debug, p_path, p_flags);
+
+	if (err != OK) {
+		return err;
+	}
+
+	_rcedit_add_data(p_preset, p_path);
+
+	if (p_preset->get("codesign/enable") && err == OK) {
+		err = _code_sign(p_preset, p_path);
+	}
+
+	return err;
+}
+
+void EditorExportPlatformWindows::get_export_options(List<ExportOption> *r_options) {
+	EditorExportPlatformPC::get_export_options(r_options);
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/enable"), false));
+#ifdef WINDOWS_ENABLED
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/identity_type", PROPERTY_HINT_ENUM, "Select automatically,Use PKCS12 file (specify *.PFX/*.P12 file),Use certificate store (specify SHA1 hash)"), 0));
+#endif
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/identity", PROPERTY_HINT_GLOBAL_FILE, "*.pfx,*.p12"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/password"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "codesign/timestamp"), true));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/timestamp_server_url"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "codesign/digest_algorithm", PROPERTY_HINT_ENUM, "SHA1,SHA256"), 1));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/description"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::PACKED_STRING_ARRAY, "codesign/custom_options"), PackedStringArray()));
+
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.ico"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/file_version", PROPERTY_HINT_PLACEHOLDER_TEXT, "1.0.0"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/product_version", PROPERTY_HINT_PLACEHOLDER_TEXT, "1.0.0"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/company_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Company Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/product_name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/file_description"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/trademarks"), ""));
+}
+
+void EditorExportPlatformWindows::_rcedit_add_data(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
+	String rcedit_path = EditorSettings::get_singleton()->get("export/windows/rcedit");
+
+	if (rcedit_path == String()) {
+		return;
+	}
+
+	if (!FileAccess::exists(rcedit_path)) {
+		ERR_PRINT("Could not find rcedit executable at " + rcedit_path + ", no icon or app information data will be included.");
+		return;
+	}
+
+#ifndef WINDOWS_ENABLED
+	// On non-Windows we need WINE to run rcedit
+	String wine_path = EditorSettings::get_singleton()->get("export/windows/wine");
+
+	if (wine_path != String() && !FileAccess::exists(wine_path)) {
+		ERR_PRINT("Could not find wine executable at " + wine_path + ", no icon or app information data will be included.");
+		return;
+	}
+
+	if (wine_path == String()) {
+		wine_path = "wine"; // try to run wine from PATH
+	}
+#endif
+
+	String icon_path = ProjectSettings::get_singleton()->globalize_path(p_preset->get("application/icon"));
+	String file_verion = p_preset->get("application/file_version");
+	String product_version = p_preset->get("application/product_version");
+	String company_name = p_preset->get("application/company_name");
+	String product_name = p_preset->get("application/product_name");
+	String file_description = p_preset->get("application/file_description");
+	String copyright = p_preset->get("application/copyright");
+	String trademarks = p_preset->get("application/trademarks");
+	String comments = p_preset->get("application/comments");
+
+	List<String> args;
+	args.push_back(p_path);
+	if (icon_path != String()) {
+		args.push_back("--set-icon");
+		args.push_back(icon_path);
+	}
+	if (file_verion != String()) {
+		args.push_back("--set-file-version");
+		args.push_back(file_verion);
+	}
+	if (product_version != String()) {
+		args.push_back("--set-product-version");
+		args.push_back(product_version);
+	}
+	if (company_name != String()) {
+		args.push_back("--set-version-string");
+		args.push_back("CompanyName");
+		args.push_back(company_name);
+	}
+	if (product_name != String()) {
+		args.push_back("--set-version-string");
+		args.push_back("ProductName");
+		args.push_back(product_name);
+	}
+	if (file_description != String()) {
+		args.push_back("--set-version-string");
+		args.push_back("FileDescription");
+		args.push_back(file_description);
+	}
+	if (copyright != String()) {
+		args.push_back("--set-version-string");
+		args.push_back("LegalCopyright");
+		args.push_back(copyright);
+	}
+	if (trademarks != String()) {
+		args.push_back("--set-version-string");
+		args.push_back("LegalTrademarks");
+		args.push_back(trademarks);
+	}
+
+#ifdef WINDOWS_ENABLED
+	OS::get_singleton()->execute(rcedit_path, args);
+#else
+	// On non-Windows we need WINE to run rcedit
+	args.push_front(rcedit_path);
+	OS::get_singleton()->execute(wine_path, args);
+#endif
+}
+
+Error EditorExportPlatformWindows::_code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
+	List<String> args;
+
+#ifdef WINDOWS_ENABLED
+	String signtool_path = EditorSettings::get_singleton()->get("export/windows/signtool");
+	if (signtool_path != String() && !FileAccess::exists(signtool_path)) {
+		ERR_PRINT("Could not find signtool executable at " + signtool_path + ", aborting.");
+		return ERR_FILE_NOT_FOUND;
+	}
+	if (signtool_path == String()) {
+		signtool_path = "signtool"; // try to run signtool from PATH
+	}
+#else
+	String signtool_path = EditorSettings::get_singleton()->get("export/windows/osslsigncode");
+	if (signtool_path != String() && !FileAccess::exists(signtool_path)) {
+		ERR_PRINT("Could not find osslsigncode executable at " + signtool_path + ", aborting.");
+		return ERR_FILE_NOT_FOUND;
+	}
+	if (signtool_path == String()) {
+		signtool_path = "osslsigncode"; // try to run signtool from PATH
+	}
+#endif
+
+	args.push_back("sign");
+
+	//identity
+#ifdef WINDOWS_ENABLED
+	int id_type = p_preset->get("codesign/identity_type");
+	if (id_type == 0) { //auto select
+		args.push_back("/a");
+	} else if (id_type == 1) { //pkcs12
+		if (p_preset->get("codesign/identity") != "") {
+			args.push_back("/f");
+			args.push_back(p_preset->get("codesign/identity"));
+		} else {
+			EditorNode::add_io_error("codesign: no identity found");
+			return FAILED;
+		}
+	} else if (id_type == 2) { //Windows certificate store
+		if (p_preset->get("codesign/identity") != "") {
+			args.push_back("/sha1");
+			args.push_back(p_preset->get("codesign/identity"));
+		} else {
+			EditorNode::add_io_error("codesign: no identity found");
+			return FAILED;
+		}
+	} else {
+		EditorNode::add_io_error("codesign: invalid identity type");
+		return FAILED;
+	}
+#else
+	if (p_preset->get("codesign/identity") != "") {
+		args.push_back("-pkcs12");
+		args.push_back(p_preset->get("codesign/identity"));
+	} else {
+		EditorNode::add_io_error("codesign: no identity found");
+		return FAILED;
+	}
+#endif
+
+	//password
+	if (p_preset->get("codesign/password") != "") {
+#ifdef WINDOWS_ENABLED
+		args.push_back("/p");
+#else
+		args.push_back("-pass");
+#endif
+		args.push_back(p_preset->get("codesign/password"));
+	}
+
+	//timestamp
+	if (p_preset->get("codesign/timestamp")) {
+		if (p_preset->get("codesign/timestamp_server") != "") {
+#ifdef WINDOWS_ENABLED
+			args.push_back("/tr");
+			args.push_back(p_preset->get("codesign/timestamp_server_url"));
+			args.push_back("/td");
+			if ((int)p_preset->get("codesign/digest_algorithm") == 0) {
+				args.push_back("sha1");
+			} else {
+				args.push_back("sha256");
+			}
+#else
+			args.push_back("-ts");
+			args.push_back(p_preset->get("codesign/timestamp_server_url"));
+#endif
+		} else {
+			EditorNode::add_io_error("codesign: invalid timestamp server");
+			return FAILED;
+		}
+	}
+
+	//digest
+#ifdef WINDOWS_ENABLED
+	args.push_back("/fd");
+#else
+	args.push_back("-h");
+#endif
+	if ((int)p_preset->get("codesign/digest_algorithm") == 0) {
+		args.push_back("sha1");
+	} else {
+		args.push_back("sha256");
+	}
+
+	//description
+	if (p_preset->get("codesign/description") != "") {
+#ifdef WINDOWS_ENABLED
+		args.push_back("/d");
+#else
+		args.push_back("-n");
+#endif
+		args.push_back(p_preset->get("codesign/description"));
+	}
+
+	//user options
+	PackedStringArray user_args = p_preset->get("codesign/custom_options");
+	for (int i = 0; i < user_args.size(); i++) {
+		String user_arg = user_args[i].strip_edges();
+		if (!user_arg.is_empty()) {
+			args.push_back(user_arg);
+		}
+	}
+
+#ifndef WINDOWS_ENABLED
+	args.push_back("-in");
+#endif
+	args.push_back(p_path);
+#ifndef WINDOWS_ENABLED
+	args.push_back("-out");
+	args.push_back(p_path + "_signed");
+#endif
+
+	String str;
+	Error err = OS::get_singleton()->execute(signtool_path, args, &str, nullptr, true);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	print_line("codesign (" + p_path + "): " + str);
+#ifndef WINDOWS_ENABLED
+	if (str.find("SignTool Error") != -1) {
+#else
+	if (str.find("Failed") != -1) {
+#endif
+		return FAILED;
+	}
+
+#ifndef WINDOWS_ENABLED
+	DirAccessRef tmp_dir = DirAccess::create_for_path(p_path.get_base_dir());
+
+	err = tmp_dir->remove(p_path);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	err = tmp_dir->rename(p_path + "_signed", p_path);
+	ERR_FAIL_COND_V(err != OK, err);
+#endif
+
+	return OK;
+}
diff --git a/platform/windows/export/export_plugin.h b/platform/windows/export/export_plugin.h
new file mode 100644
index 0000000000..11d3826410
--- /dev/null
+++ b/platform/windows/export/export_plugin.h
@@ -0,0 +1,51 @@
+/*************************************************************************/
+/*  export_plugin.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef WINDOWS_EXPORT_PLUGIN_H
+#define WINDOWS_EXPORT_PLUGIN_H
+
+#include "core/io/file_access.h"
+#include "core/os/os.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "platform/windows/logo.gen.h"
+
+class EditorExportPlatformWindows : public EditorExportPlatformPC {
+	void _rcedit_add_data(const Ref<EditorExportPreset> &p_preset, const String &p_path);
+	Error _code_sign(const Ref<EditorExportPreset> &p_preset, const String &p_path);
+
+public:
+	virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0);
+	virtual Error sign_shared_object(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path);
+	virtual void get_export_options(List<ExportOption> *r_options);
+};
+
+#endif