From 8648b0599103c9cebb5a9546ca9e1af503f729eb Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Tue, 16 Jan 2024 15:15:06 +0200 Subject: [PATCH 1/5] Update AndroidPlatform.hx --- tools/platforms/AndroidPlatform.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 9372437ee..010066f00 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -145,7 +145,7 @@ class AndroidPlatform extends PlatformTarget var architectures = []; if (hasARMV5) architectures.push(Architecture.ARMV5); - if (hasARMV7 || (!hasARMV5 && !hasX86)) architectures.push(Architecture.ARMV7); + if (hasARMV7) architectures.push(Architecture.ARMV7); if (hasARM64) architectures.push(Architecture.ARM64); if (hasX86) architectures.push(Architecture.X86); if (hasX64) architectures.push(Architecture.X64); From 1f0ddb34cbe6c80ebf7194e82116e7b24998c0e1 Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Wed, 17 Jan 2024 05:59:08 +0200 Subject: [PATCH 2/5] Just in case --- tools/platforms/AndroidPlatform.hx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 010066f00..916694981 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -150,6 +150,8 @@ class AndroidPlatform extends PlatformTarget if (hasX86) architectures.push(Architecture.X86); if (hasX64) architectures.push(Architecture.X64); + if (architectures.length == 0) architectures.push(Architecture.ARM64); + for (architecture in architectures) { var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"]; From 380f64cb6ef96d0d548da44c0e23493035b6fb3b Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Wed, 17 Jan 2024 06:17:00 +0200 Subject: [PATCH 3/5] Forgot this --- tools/platforms/AndroidPlatform.hx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 916694981..9bcad5a4b 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -150,7 +150,12 @@ class AndroidPlatform extends PlatformTarget if (hasX86) architectures.push(Architecture.X86); if (hasX64) architectures.push(Architecture.X64); - if (architectures.length == 0) architectures.push(Architecture.ARM64); + if (architectures.length == 0) + { + hasARM64 = true; + + architectures.push(Architecture.ARM64); + } for (architecture in architectures) { From d6a3954a57143fd7aacd7bb06900641088667c0a Mon Sep 17 00:00:00 2001 From: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com> Date: Wed, 17 Jan 2024 06:34:40 +0200 Subject: [PATCH 4/5] Also warn the user about it. --- tools/platforms/AndroidPlatform.hx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 9bcad5a4b..f9f7d8bf0 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -152,6 +152,8 @@ class AndroidPlatform extends PlatformTarget if (architectures.length == 0) { + Log.warn("No architecture selected, resorting to arm64."); + hasARM64 = true; architectures.push(Architecture.ARM64); From 86bcc7352d744506906bcdb9bf75513ed084b008 Mon Sep 17 00:00:00 2001 From: player-03 Date: Thu, 18 Jan 2024 13:35:07 -0500 Subject: [PATCH 5/5] Tweak warning message. --- tools/platforms/AndroidPlatform.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index f9f7d8bf0..56fa6aeae 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -152,7 +152,7 @@ class AndroidPlatform extends PlatformTarget if (architectures.length == 0) { - Log.warn("No architecture selected, resorting to arm64."); + Log.warn("No architecture selected, defaulting to ARM64."); hasARM64 = true;