From 74fc4410f462e26ce9842eeb1cebb428532f9915 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Tue, 8 Feb 2022 22:09:30 +0100 Subject: [PATCH] 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. --- .github/workflows/ios_builds.yml | 2 +- misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj | 4 ++-- modules/gdnative/gdnative_library_editor_plugin.cpp | 1 - .../mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs | 1 - platform/iphone/export/export_plugin.cpp | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index 721d574dbe2..cd9c7ec117b 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -25,7 +25,7 @@ jobs: - name: Setup python and scons uses: ./.github/actions/godot-deps - - name: Compilation (armv7) + - name: Compilation (arm64v8) uses: ./.github/actions/godot-build with: sconsflags: ${{ env.SCONSFLAGS }} diff --git a/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj b/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj index 5ba45c0c13e..e2505de3bf1 100644 --- a/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj +++ b/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj @@ -325,7 +325,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug"; TARGETED_DEVICE_FAMILY = "$targeted_device_family"; - VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64"; + VALID_ARCHS = "arm64 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -356,7 +356,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "$provisioning_profile_uuid_release"; TARGETED_DEVICE_FAMILY = "$targeted_device_family"; - VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64"; + VALID_ARCHS = "arm64 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/modules/gdnative/gdnative_library_editor_plugin.cpp b/modules/gdnative/gdnative_library_editor_plugin.cpp index f94464826ee..33ea078696b 100644 --- a/modules/gdnative/gdnative_library_editor_plugin.cpp +++ b/modules/gdnative/gdnative_library_editor_plugin.cpp @@ -315,7 +315,6 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() { NativePlatformConfig platform_ios; platform_ios.name = "iOS"; - platform_ios.entries.push_back("armv7"); platform_ios.entries.push_back("arm64"); platform_ios.entries.push_back("x86_64"); // iOS can use both Static and Dynamic libraries. diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs index 37e6a349778..ed758cc137e 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs @@ -537,7 +537,6 @@ MONO_AOT_MODE_LAST = 1000, { var iosArchs = new[] { - "armv7", "arm64" }; diff --git a/platform/iphone/export/export_plugin.cpp b/platform/iphone/export/export_plugin.cpp index fe00b1a3cd2..122e64d6a1e 100644 --- a/platform/iphone/export/export_plugin.cpp +++ b/platform/iphone/export/export_plugin.cpp @@ -43,7 +43,6 @@ void EditorExportPlatformIOS::get_preset_features(const Ref Vector EditorExportPlatformIOS::_get_supported_architectures() { Vector archs; - archs.push_back(ExportArchitecture("armv7", false)); // Disabled by default, not included in official templates. archs.push_back(ExportArchitecture("arm64", true)); return archs; }