chore: try universal apk

jekyllex · Aug 22, 2024 · d4033b0 · d4033b0
1 parent cae0488
commit d4033b0
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 41 deletions.
diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml
@@ -51,15 +51,15 @@ jobs:
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
         run: |
           if [ "$BUILD_TYPE" = "release" ]; then
-            ./gradlew assembleRelease assemble32Bit assemble64Bit
+            ./gradlew assembleRelease # assemble32Bit assemble64Bit
             mv app/build/outputs/apk/release/*.apk .
           elif [ "$BUILD_TYPE" = "debug" ]; then
-            ./gradlew assembleDebug assemble32Bit assemble64Bit
+            ./gradlew assembleDebug # assemble32Bit assemble64Bit
             mv app/build/outputs/apk/debug/*.apk .
           fi
 
-          mv app/build/outputs/apk/32bit/*.apk .
-          mv app/build/outputs/apk/64bit/*.apk .
+          # mv app/build/outputs/apk/32bit/*.apk .
+          # mv app/build/outputs/apk/64bit/*.apk .
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v4

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -57,14 +57,14 @@ android {
             storePassword = System.getenv("KEYSTORE_PASSWORD")
         }
     }
-
-    splits {
-        abi {
-            isEnable = true
-            reset()
-            include("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
-        }
-    }
+//
+//    splits {
+//        abi {
+//            isEnable = true
+//            reset()
+//            include("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
+//        }
+//    }
 
     buildTypes {
         release {
@@ -79,35 +79,35 @@ android {
             signingConfig = signingConfigs.getByName("release")
         }
 
-        create("32bit") {
-            initWith(getByName(envBuildType))
-
-            splits {
-                abi {
-                    isEnable = false
-                }
-            }
-
-            ndk {
-                abiFilters.add("x86_64")
-                abiFilters.add("arm64-v8a")
-            }
-        }
-
-        create("64bit") {
-            initWith(getByName(envBuildType))
-
-            splits {
-                abi {
-                    isEnable = false
-                }
-            }
-
-            ndk {
-                abiFilters.add("x86")
-                abiFilters.add("armeabi-v7a")
-            }
-        }
+//        create("32bit") {
+//            initWith(getByName(envBuildType))
+//
+//            splits {
+//                abi {
+//                    isEnable = false
+//                }
+//            }
+//
+//            ndk {
+//                abiFilters.add("x86_64")
+//                abiFilters.add("arm64-v8a")
+//            }
+//        }
+//
+//        create("64bit") {
+//            initWith(getByName(envBuildType))
+//
+//            splits {
+//                abi {
+//                    isEnable = false
+//                }
+//            }
+//
+//            ndk {
+//                abiFilters.add("x86")
+//                abiFilters.add("armeabi-v7a")
+//            }
+//        }
     }
 
     compileOptions {