From cd83a6c1be575632ee62af2dd0266a0dcdf97f8f Mon Sep 17 00:00:00 2001
From: UjuiUjuMandan <125150101+UjuiUjuMandan@users.noreply.github.com>
Date: Thu, 9 Jan 2025 17:24:50 +0000
Subject: [PATCH] Workaround for
 https://gitlab.com/fdroid/fdroiddata/-/issues/2998#note_1405234894

---
 .github/workflows/build.yml  |  5 ++++-
 V2rayNG/app/build.gradle.kts | 12 ++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ef2c9b76..084b3c58b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,7 +134,10 @@ jobs:
       run: |
         cd ${{ github.workspace }}/V2rayNG
         chmod 755 gradlew
-        ./gradlew assembleFdroidRelease
+        ./gradlew assembleFdroidRelease -ABI_FILTERS=arm64-v8a
+        ./gradlew assembleFdroidRelease -ABI_FILTERS=armeabi-v7a
+        ./gradlew assembleFdroidRelease -ABI_FILTERS=x86_64
+        ./gradlew assembleFdroidRelease -ABI_FILTERS=x86
       env:
         ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts
index 7830347dd..8e6d9aad9 100644
--- a/V2rayNG/app/build.gradle.kts
+++ b/V2rayNG/app/build.gradle.kts
@@ -19,19 +19,11 @@ android {
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
         splits {
             abi {
-                isEnable = true
-                reset()
                 if (abiFilterList != null && abiFilterList.isNotEmpty()) {
+                    isEnable = true
+                    reset()
                     include(*abiFilterList.toTypedArray())
-                } else {
-                    include(
-                        "arm64-v8a",
-                        "armeabi-v7a",
-                        "x86_64",
-                        "x86"
-                    )
                 }
-                isUniversalApk = abiFilterList.isNullOrEmpty()
             }
         }