From af99bf93d3bf2d7a487946d4c8375f76163db08b Mon Sep 17 00:00:00 2001
From: Anish Kumar <mishragames@gmail.com>
Date: Fri, 7 Aug 2026 18:08:53 +0530
Subject: [PATCH] Fix building Android Editor with separate arches

(cherry picked from commit fa03d6d3d30be7e9018f245ff42ead0a3ff911c0)
---
 platform/android/java/build.gradle        | 12 ++++++++++++
 platform/android/java/editor/build.gradle |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index bf04ffb43a..3d90410dc5 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -42,6 +42,9 @@ ext {
     rootDir = "../../.."
     binDir = "$rootDir/bin/"
     androidEditorBuildsDir = "$binDir/android_editor_builds/"
+
+    // Used by the editor module to set abiFilters.
+    detectedAbis = []
 }
 
 def getSconsTaskName(String flavor, String buildType, String abi) {
@@ -120,9 +123,18 @@ def generateBuildTasks(String flavor = "template", String edition = "standard",
     boolean excludeSconsBuildTasks = excludeSconsBuildTasks()
     boolean isTemplate = flavor == "template"
     String libsDir = isTemplate ? "lib/libs/" : "lib/libs/tools/"
+    def validAbis = ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
     for (String target : supportedFlavorsBuildTypes[flavor]) {
         File targetLibs = new File(libsDir + target)
 
+        if (targetLibs != null && targetLibs.isDirectory()) {
+            targetLibs.listFiles()?.each { abiDir ->
+                if (abiDir.isDirectory() && validAbis.contains(abiDir.name) && abiDir.listFiles()?.length > 0) {
+                    detectedAbis.add(abiDir.name)
+                }
+            }
+        }
+
         String targetSuffix = target
 
         if (!excludeSconsBuildTasks || (targetLibs != null
diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle
index ab2d17aa31..fcbb102851 100644
--- a/platform/android/java/editor/build.gradle
+++ b/platform/android/java/editor/build.gradle
@@ -166,6 +166,11 @@ android {
         android {
             dimension "android_distribution"
             missingDimensionStrategy 'products', 'editor'
+            ndk {
+                if (!detectedAbis.isEmpty()) {
+                    abiFilters += detectedAbis
+                }
+            }
         }
         horizonos {
             dimension "android_distribution"