chore(build): add more build variants

Add x86 and universal variants
Bambooin · Oct 30, 2021 · e45801a · e45801a
1 parent f323fd5
commit e45801a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Upload Trime artifact
         uses: actions/upload-artifact@v2
         with:
-          name: trime-debug.apk
-          path: app/build/outputs/apk/debug/app-debug.apk
+          name: outputs
+          path: app/build/outputs/apk/**/*.apk
           # keep 360 days
           retention-days: 360
diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Upload Trime artifact
         uses: actions/upload-artifact@v2
         with:
-          name: trime-debug.apk
-          path: app/build/outputs/apk/debug/app-debug.apk
+          name: outputs
+          path: app/build/outputs/apk/**/*.apk
           # keep 30 days
           retention-days: 30
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Create release
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "app/build/outputs/apk/debug/app-debug.apk"
+          artifacts: "app/build/outputs/apk/**/*.apk"
           body: |
             ${{ steps.release_log.outputs.changelog }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,16 +3,14 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 30
+    ndkVersion "23.0.7599858"
 
     defaultConfig {
         applicationId "com.osfans.trime"
         minSdkVersion 21 // 21 is required for `readlinkat` for capnpproto
         targetSdkVersion 29
         versionCode 20211130
         versionName "3.2.4"
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
-        }
     }
 
     signingConfigs {
@@ -54,7 +52,27 @@ android {
             version "3.10.2"
         }
     }
-    ndkVersion "23.0.7599858"
+
+    flavorDimensions 'cpuArch'
+    productFlavors {
+        arm {
+            dimension 'cpuArch'
+            ndk {
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
+            }
+        }
+        x86 {
+            dimension 'cpuArch'
+            ndk {
+                abiFilters 'x86_64', 'x86'
+            }
+        }
+        universal {
+            dimension 'cpuArch'
+            // include all default ABIs. with NDK-r16,  it is:
+            //   armeabi-v7a, arm64-v8a, x86, x86_64
+        }
+    }
 }
 
 dependencies {