Skip to content

[Android] Phase out older ARM architectures #1928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 9.0.0-dev
Choose a base branch
from
Open

[Android] Phase out older ARM architectures #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0157b0
Remove `armv7` from compilation by default.
MAJigsaw77 Mar 14, 2025
037daa2
Remove `armv5` and adjust the architectures to properly rebuild.
MAJigsaw77 Mar 14, 2025
eac6197
Some adjustments
MAJigsaw77 Mar 14, 2025
1545200
Compile `x86_64` when rebuilding lime.
MAJigsaw77 Mar 14, 2025
a4b4fca
Merge branch '8.3.0-Dev' into rm-armv7-armv5
player-03 Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions include.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@
<define name="MACOSX_DEPLOYMENT_TARGET" value="10.9" if="mac" unless="MACOSX_DEPLOYMENT_TARGET" />
<setenv name="MACOSX_DEPLOYMENT_TARGET" value="${MACOSX_DEPLOYMENT_TARGET}" if="mac" />

<architecture name="armv7" if="android" />

<section if="emscripten">

<dependency name="pthread" />
Expand Down
21 changes: 3 additions & 18 deletions tools/platforms/AndroidPlatform.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,13 @@ class AndroidPlatform extends PlatformTarget
var hxml = targetDirectory + "/haxe/" + buildType + ".hxml";
var sourceSet = destination + "/app/src/main";

var hasARMV5 = (ArrayTools.containsValue(project.architectures, Architecture.ARMV5)
|| ArrayTools.containsValue(project.architectures, Architecture.ARMV6));
var hasARMV7 = ArrayTools.containsValue(project.architectures, Architecture.ARMV7);
var hasARM64 = ArrayTools.containsValue(project.architectures, Architecture.ARM64);
var hasX86 = ArrayTools.containsValue(project.architectures, Architecture.X86);
var hasX64 = ArrayTools.containsValue(project.architectures, Architecture.X64);

var architectures = [];

if (hasARMV5) architectures.push(Architecture.ARMV5);
if (hasARMV7) architectures.push(Architecture.ARMV7);
if (hasARM64) architectures.push(Architecture.ARM64);
if (hasX86) architectures.push(Architecture.X86);
Expand All @@ -164,7 +161,7 @@ class AndroidPlatform extends PlatformTarget
var minSDKVer = project.config.getInt("android.minimum-sdk-version", 21);
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer'];
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer'];
var path = sourceSet + "/jniLibs/armeabi";
var path = sourceSet + "/jniLibs/";
var suffix = ".so";

if (architecture == Architecture.ARMV7)
Expand Down Expand Up @@ -214,14 +211,6 @@ class AndroidPlatform extends PlatformTarget
System.copyIfNewer(targetDirectory + "/obj/libApplicationMain" + (project.debug ? "-debug" : "") + suffix, path + "/libApplicationMain.so");
}

if (!hasARMV5)
{
if (FileSystem.exists(sourceSet + "/jniLibs/armeabi"))
{
System.removeDirectory(sourceSet + "/jniLibs/armeabi");
}
}

if (!hasARMV7)
{
if (FileSystem.exists(sourceSet + "/jniLibs/armeabi-v7a"))
Expand Down Expand Up @@ -364,19 +353,15 @@ class AndroidPlatform extends PlatformTarget

public override function rebuild():Void
{
var armv5 = (/*command == "rebuild" ||*/
ArrayTools.containsValue(project.architectures, Architecture.ARMV5)
|| ArrayTools.containsValue(project.architectures, Architecture.ARMV6));
var armv7 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.ARMV7));
var armv7 = ArrayTools.containsValue(project.architectures, Architecture.ARMV7);
var arm64 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.ARM64));
var x86 = (ArrayTools.containsValue(project.architectures, Architecture.X86));
var x86 = ArrayTools.containsValue(project.architectures, Architecture.X86);
var x64 = (command == "rebuild" || ArrayTools.containsValue(project.architectures, Architecture.X64));

var commands = [];
var minSDKVer = 21;
var platformDefine = '-DPLATFORM_NUMBER=$minSDKVer';

if (armv5) commands.push(["-Dandroid", platformDefine]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", platformDefine]);
if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", platformDefine]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", platformDefine]);
Expand Down
Loading