Update gradle

app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 android {
     compileSdk 34
-    flavorDimensions = ["mode", "api", "abi"]
+    flavorDimensions = ["mode", "api"]
 
     defaultConfig {
         applicationId "com.fongmi.android.tv"
@@ -32,18 +32,6 @@ android {
         python {
             dimension "api"
         }
-        x86 {
-            dimension "abi"
-            ndk { abiFilters "x86" }
-        }
-        arm64_v8a {
-            dimension "abi"
-            ndk { abiFilters "arm64-v8a" }
-        }
-        armeabi_v7a {
-            dimension "abi"
-            ndk { abiFilters "armeabi-v7a" }
-        }
     }
 
     buildFeatures {
@@ -58,6 +46,15 @@ android {
         }
     }
 
+    splits {
+        abi {
+            enable true
+            reset()
+            include "armeabi-v7a", "arm64-v8a"
+            universalApk false
+        }
+    }
+
     packagingOptions {
         exclude 'META-INF/beans.xml'
     }
@@ -67,12 +64,6 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    android.applicationVariants.configureEach { variant ->
-        variant.outputs.configureEach { output ->
-            outputFileName = "${variant.productFlavors[0].name}-${variant.productFlavors[1].name}-${variant.productFlavors[2].name}.apk"
-        }
-    }
-
     configurations.configureEach {
         resolutionStrategy {
             force 'com.squareup.okhttp3:okhttp:' + okhttpVersion

app/src/leanback/java/com/fongmi/android/tv/Updater.java

@@ -11,6 +11,7 @@ import com.fongmi.android.tv.utils.Download;
 import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Github;
 import com.github.catvod.utils.Path;
@@ -44,7 +45,7 @@ public class Updater implements Download.Callback {
     }
 
     private String getApk() {
-        return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + BuildConfig.FLAVOR_abi);
+        return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + Util.getArch());
     }
 
     public Updater force() {

app/src/main/java/com/fongmi/android/tv/utils/Util.java

@@ -7,6 +7,7 @@ import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
@@ -181,4 +182,15 @@ public class Util {
         }
         return false;
     }
+
+    public static String getArch() {
+        try {
+            PackageInfo info = App.get().getPackageManager().getPackageInfo(App.get().getPackageName(), 0);
+            String abi = info.applicationInfo.nativeLibraryDir;
+            if (abi.endsWith("64")) return "arm64_v8a";
+            return "armeabi_v7a";
+        } catch (Throwable e) {
+            return "armeabi_v7a";
+        }
+    }
 }

app/src/mobile/java/com/fongmi/android/tv/Updater.java

@@ -12,6 +12,7 @@ import com.fongmi.android.tv.utils.Download;
 import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Github;
 import com.github.catvod.utils.Path;
@@ -45,7 +46,7 @@ public class Updater implements Download.Callback {
     }
 
     private String getApk() {
-        return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + BuildConfig.FLAVOR_abi);
+        return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + Util.getArch());
     }
 
     public Updater force() {

pyramid/build.gradle

@@ -5,11 +5,13 @@ plugins {
 
 android {
     compileSdk 34
-    flavorDimensions = ["abi"]
 
     defaultConfig {
         minSdk 21
         targetSdk 28
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a"
+        }
         python {
             version "3.8"
             pip {
@@ -21,21 +23,6 @@ android {
         }
     }
 
-    productFlavors {
-        x86 {
-            dimension "abi"
-            ndk { abiFilters "x86" }
-        }
-        arm64_v8a {
-            dimension "abi"
-            ndk { abiFilters "arm64-v8a" }
-        }
-        armeabi_v7a {
-            dimension "abi"
-            ndk { abiFilters "armeabi-v7a" }
-        }
-    }
-
     sourceSets {
         main {
             python.srcDirs = ["src/main/python"]