Merge pull request #1745 from MAJigsaw77/patch-1

Don't compile `armv7` if the `architecture` excluded it.
openfl · Jan 18, 2024 · d520fc6 · d520fc6
2 parents a414f64 + 86bcc73
commit d520fc6
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx
@@ -145,11 +145,20 @@ 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);
 
+		if (architectures.length == 0)
+		{
+			Log.warn("No architecture selected, defaulting to ARM64.");
+
+			hasARM64 = true;
+
+			architectures.push(Architecture.ARM64);
+		}
+
 		for (architecture in architectures)
 		{
 			var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];