From abc5b43cc62a32dcd4b47537bb24c365d633614d Mon Sep 17 00:00:00 2001
From: ForestL18 <45709305+ForestL18@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:41:49 +0800
Subject: [PATCH] fix build error and filter target arch

---
 build.gradle.kts      |  8 +++++++-
 core/build.gradle.kts | 16 ++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9f5a5445c..6337bf7d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,6 +52,10 @@ subprojects {
             resValue("string", "release_name", "v$versionName")
             resValue("integer", "release_code", "$versionCode")
 
+            ndk {
+                abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
+            }
+
             externalNativeBuild {
                 cmake {
                     abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
@@ -164,6 +168,8 @@ subprojects {
                 abi {
                     isEnable = true
                     isUniversalApk = true
+                    reset()
+                    include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
                 }
             }
         }
@@ -189,4 +195,4 @@ tasks.wrapper {
         file("gradle/wrapper/gradle-wrapper.properties")
             .appendText("distributionSha256Sum=$sha256")
     }
-}
+}
\ No newline at end of file
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 3a0bca6c0..b0b655f00 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -62,13 +62,17 @@ afterEvaluate {
     }
 }
 
-val abis = listOf("armeabi-v7a" to "ArmeabiV7a", "arm64-v8a" to "Arm64V8a", "x86_64" to "X8664", "x86" to "X86")
+val abis = listOf("arm64-v8a" to "Arm64V8a", "armeabi-v7a" to "ArmeabiV7a", "x86" to "X86", "x86_64" to "X8664")
 
 androidComponents.onVariants { variant ->
-    afterEvaluate {
-        for ((abi, goAbi) in abis) {
-            val cmakeName = if (variant.buildType == "debug") "Debug" else "RelWithDebInfo"
-            tasks.getByName("buildCMake$cmakeName[$abi]").dependsOn(tasks.getByName("externalGolangBuild${variant.name.capitalizeUS()}$goAbi"))
+    val cmakeName = if (variant.buildType == "debug") "Debug" else "RelWithDebInfo"
+
+    abis.forEach { (abi, goAbi) ->
+        tasks.configureEach {
+            if (name.startsWith("buildCMake$cmakeName[$abi]")) {
+                dependsOn("externalGolangBuild${variant.name.capitalizeUS()}$goAbi")
+                println("Set up dependency: $name -> externalGolangBuild${variant.name.capitalizeUS()}$goAbi")
+            }
         }
     }
-}
+}
\ No newline at end of file