diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2021-12-15 17:38:10 -0800 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-08-25 11:19:20 +0200 |
| commit | 27b0f182758db5d2d4c123c81430c34941161b39 (patch) | |
| tree | 1182408f0be3567400ff08ace5b4d48b40815641 /platform/android/export | |
| parent | 8916949b5051080e48d21e986eb5d77de67a882d (diff) | |
Unify bits, arch, and android_arch into env["arch"]
Fully removes the `bits` option and adapts the code that relied on it.
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
Diffstat (limited to 'platform/android/export')
| -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 685b1f01af..016af40b52 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("armeabi-v7a"); - abis.push_back("arm64-v8a"); - abis.push_back("x86"); + abis.push_back("arm32"); + abis.push_back("arm64"); + abis.push_back("x86_32"); 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-v8a"; + const bool is_default = abi == "arm64"; r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("%s/%s", PNAME("architectures"), abi)), is_default)); } |