diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-26 07:45:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-26 07:45:02 +0200 |
| commit | 1b8f2e20bfd4d4a5f9cac5eb4e7fe350a82761df (patch) | |
| tree | 0d042a30eb7b962b5a5d10dc7116e13681a4cac1 /platform/android | |
| parent | 9876382df8c0fcb7880ca20b053d1f2b2a358785 (diff) | |
| parent | ba9e2cf5128050b80fd1438385893b12d3f7bc78 (diff) | |
Merge pull request #64912 from m4gr3d/fix_android_arch_mapping_main
Revert the architecture values update made to the Android export logic
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 016af40b52..685b1f01af 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -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)); } |