Remove support for ARMv7 (32-bit) on iOS

All iOS devices since the iPhone 5S support ARMv8 (64-bit).

The last iOS version supported on ARMv7 devices is 10.x, which is
too old to run Godot 4.0 projects since the minimum supported
iOS version is 11.0.
This commit is contained in:
Hugo Locurcio 2022-02-08 22:09:30 +01:00
parent 76ce5c16f3
commit 74fc4410f4
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
5 changed files with 3 additions and 6 deletions

View File

@ -25,7 +25,7 @@ jobs:
- name: Setup python and scons - name: Setup python and scons
uses: ./.github/actions/godot-deps uses: ./.github/actions/godot-deps
- name: Compilation (armv7) - name: Compilation (arm64v8)
uses: ./.github/actions/godot-build uses: ./.github/actions/godot-build
with: with:
sconsflags: ${{ env.SCONSFLAGS }} sconsflags: ${{ env.SCONSFLAGS }}

View File

@ -325,7 +325,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug"; PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
TARGETED_DEVICE_FAMILY = "$targeted_device_family"; TARGETED_DEVICE_FAMILY = "$targeted_device_family";
VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64"; VALID_ARCHS = "arm64 x86_64";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Debug; name = Debug;
@ -356,7 +356,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "$provisioning_profile_uuid_release"; PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
TARGETED_DEVICE_FAMILY = "$targeted_device_family"; TARGETED_DEVICE_FAMILY = "$targeted_device_family";
VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64"; VALID_ARCHS = "arm64 x86_64";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Release; name = Release;

View File

@ -315,7 +315,6 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
NativePlatformConfig platform_ios; NativePlatformConfig platform_ios;
platform_ios.name = "iOS"; platform_ios.name = "iOS";
platform_ios.entries.push_back("armv7");
platform_ios.entries.push_back("arm64"); platform_ios.entries.push_back("arm64");
platform_ios.entries.push_back("x86_64"); platform_ios.entries.push_back("x86_64");
// iOS can use both Static and Dynamic libraries. // iOS can use both Static and Dynamic libraries.

View File

@ -537,7 +537,6 @@ MONO_AOT_MODE_LAST = 1000,
{ {
var iosArchs = new[] var iosArchs = new[]
{ {
"armv7",
"arm64" "arm64"
}; };

View File

@ -43,7 +43,6 @@ void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset>
Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() { Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() {
Vector<ExportArchitecture> archs; Vector<ExportArchitecture> archs;
archs.push_back(ExportArchitecture("armv7", false)); // Disabled by default, not included in official templates.
archs.push_back(ExportArchitecture("arm64", true)); archs.push_back(ExportArchitecture("arm64", true));
return archs; return archs;
} }