From e0a2672721a46dce8d4c395bdc8b7326cfbf94b4 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Mon, 29 Jul 2024 11:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ABI=E7=9A=84=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5fd1dd31..51d220f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
                 // cppFlags '-std=c++17 -Wno-error=format-security'
                 // arguments "-DANDROID_STL=c++_shared"
                 arguments "-DNCNN_DISABLE_EXCEPTION=OFF", "-DTERM_CORE_ROOT=" + coreroot, "-DOpenCV_DIR=" + opencvsdk + "/sdk/native/jni", "-DASIO_ROOT=" + asioroot, "-DEVPP_ROOT=" + evpproot, "-DNCNN_ROOT=" + ncnnroot
-                abiFilters 'arm64-v8a'
+                // abiFilters 'arm64-v8a', 'armeabi-v7a'
                 // setAbiFilters(['arm64-v8a'])
             }
         }
@@ -74,6 +74,17 @@ android {
         }
     }
 
+    splits {
+        boolean isReleaseTask = gradle.startParameter.taskNames.any { it.contains("Release") }
+        // enabled on release build
+        abi {
+            enable isReleaseTask
+            reset()
+            include "armeabi-v7a", "arm64-v8a"
+            universalApk false
+        }
+    }
+
     android.applicationVariants.all { variant ->
         variant.outputs.all { output ->
             if (outputFileName.endsWith('.apk')) {
@@ -81,7 +92,9 @@ android {
                 if(variant.buildType.name.equals('release')) {
                     buildTypeFlag = "rel"
                 }
-                def fileName = "mpapp_v${defaultConfig.versionName}_${buildTypeFlag}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}.apk"
+                def abi = output.getFilter(com.android.build.OutputFile.ABI)
+                if (abi == null) abi = "all"
+                def fileName = "mpapp_v${defaultConfig.versionName}_${buildTypeFlag}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}_${abi}.apk"
                 outputFileName = fileName
             }
         }