Add build variants/flavors

src/KenjinxAndroid/app/build.gradle

@@ -23,7 +23,8 @@ android {
 
         externalNativeBuild {
             cmake {
-                cppFlags "-std=c++20 -O3 -fno-math-errno -fno-trapping-math -fno-signed-zeros -ffinite-math-only -march=armv8-a"
+                cppFlags "-std=c++20 -O3",
+                    "-fno-math-errno -fno-trapping-math -fno-signed-zeros -ffinite-math-only"
                 arguments "-DANDROID_STL=c++_shared",
                     "-DCMAKE_BUILD_TYPE=Release",
                     "-DANDROID_ARM_NEON=TRUE",
@@ -34,17 +35,62 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            // minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig = signingConfigs.debug
             debuggable false
             jniDebuggable false
         }
     }
 
+    def deviceFlavors = [
+        armv8  : "-march=armv8-a",
+        armv82 : "-march=armv8.2-a",
+        armv87 : "-march=armv8.7-a",
+        sd8eg5 : "-march=armv8.7-a+sve+sve2",
+    ]
+
+    flavorDimensions "appid", "device"
+    productFlavors {
+        mainline {
+            dimension "appid"
+            applicationId "org.kenjinx.android"
+            manifestPlaceholders = [applicationLabel: "@string/app_name"]
+        }
+       optimized {
+            dimension "appid"
+            applicationId "com.garena.game.codm"
+            manifestPlaceholders = [applicationLabel: "@string/app_name_optimized"]
+        }
+    }
+
+    deviceFlavors.each { name, flags ->
+        productFlavors.create(name) {
+            dimension "device"
+            externalNativeBuild {
+                cmake {
+                    cppFlags flags
+                }
+            }
+        }
+    }
+
     androidComponents {
-        onVariants(selector().withBuildType("release")) {
+        onVariants(selector().withBuildType("debug")) {
-            packaging.dex.useLegacyPackaging.set(true)
+            packaging.dex.useLegacyPackaging.set(false)
+        }
+        beforeVariants(selector().all()) { variant ->
+            def flavors = variant.productFlavors.collect { it.second }.toSet()
+
+            def invalidCombos = [
+                ["optimized", "armv8"],
+                ["optimized", "armv87"],
+                ["optimized", "sd8eg5"]
+            ]
+
+            if (invalidCombos.any { combo -> flavors.containsAll(combo) }) {
+                enable = false
+            }
         }
     }
 
@@ -64,6 +110,9 @@ android {
             keepDebugSymbols += '**/libkenjinx.so'
             useLegacyPackaging true
         }
+        dex {
+            useLegacyPackaging true
+        }
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }

src/KenjinxAndroid/app/src/main/AndroidManifest.xml

@@ -42,7 +42,7 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:isGame="true"
-        android:label="@string/app_name"
+        android:label="${applicationLabel}"
         android:supportsRtl="true"
         android:theme="@style/Theme.KenjinxAndroid"
         android:largeHeap="true"

src/KenjinxAndroid/app/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Kenji-NX</string>
+    <string name="app_name_optimized">Kenji-NX Optimized</string>
 </resources>

src/KenjinxAndroid/libkenjinx/build.gradle

@@ -118,7 +118,6 @@ tasks.register('compileLibKenjinx', Exec) {
         baseArgs.addAll([
             "-p:IlcOptimizationPreference=Speed",
             "-p:IlcOptimizationLevel=3",
-            "-p:IlcFoldIdenticalMethodBodies=true",
             "-p:IlcGenerateStackTraceData=false",
             "-p:TrimMode=full",
             "-p:IlcTrimMetadata=true",