godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-07 19:53:17 +00:00
Code Releases Wiki Activity

Merge pull request #64912 from m4gr3d/fix_android_arch_mapping_main

Browse Source 
Revert the architecture values update made to the Android export logic
This commit is contained in:
Rémi Verschelde
2022-08-26 07:45:02 +02:00
committed by GitHub
parent 9876382df8 ba9e2cf512
commit 1b8f2e20bf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -588,9 +588,9 @@ zip_fileinfo EditorExportPlatformAndroid::get_zip_fileinfo() {
Vector<String> EditorExportPlatformAndroid::get_abis() {
Vector<String> abis;
abis.push_back("arm32");
abis.push_back("arm64");
abis.push_back("x86_32");
abis.push_back("armeabi-v7a");
abis.push_back("arm64-v8a");
abis.push_back("x86");
abis.push_back("x86_64");
return abis;
}
@@ -1710,7 +1710,7 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
const String abi = abis[i];
// All Android devices supporting Vulkan run 64-bit Android,
// so there is usually no point in exporting for 32-bit Android.
const bool is_default = abi == "arm64";
const bool is_default = abi == "arm64-v8a";
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("architectures"), abi)), is_default));
}