From 7194765213f1a5456f5799ffc72abe1041e3fa9a Mon Sep 17 00:00:00 2001
From: Jefino9488 <jefinojacob9488@gmail.com>
Date: Fri, 3 Apr 2026 10:22:03 +0530
Subject: [PATCH] feat: move Kaorios to system paths and upload module test
 artifacts

---
 .github/workflows/feature-test-suite.yml | 12 ++++++++++++
 scripts/core/module.sh                   | 12 ++++++------
 templates/framework-patcher-module       |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/feature-test-suite.yml b/.github/workflows/feature-test-suite.yml
index 16db9eb..895e60b 100644
--- a/.github/workflows/feature-test-suite.yml
+++ b/.github/workflows/feature-test-suite.yml
@@ -243,6 +243,8 @@ jobs:
               continue
             fi
 
+            cp "$module_zip" "${case_dir}/Framework-Patcher-android${{ matrix.android_version }}-${case_name}.zip"
+
             for output_jar in framework_patched.jar services_patched.jar miui-services_patched.jar miui-framework_patched.jar; do
               if [ -f "$output_jar" ]; then
                 cp "$output_jar" "${case_dir}/"
@@ -278,4 +280,14 @@ jobs:
           if-no-files-found: warn
           path: |
             test-results/android${{ matrix.android_version }}/**/*_patched.jar
+          retention-days: 7
+
+      - name: Upload module ZIP artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android${{ matrix.android_version }}-feature-test-modules-${{ github.run_id }}
+          if-no-files-found: warn
+          path: |
+            test-results/android${{ matrix.android_version }}/**/Framework-Patcher-android${{ matrix.android_version }}-*.zip
           retention-days: 7
\ No newline at end of file
diff --git a/scripts/core/module.sh b/scripts/core/module.sh
index c76a1d7..7913c6b 100644
--- a/scripts/core/module.sh
+++ b/scripts/core/module.sh
@@ -102,20 +102,20 @@ create_module() {
         
         # 1. Install APK as system app (priv-app)
         if [ -f "kaorios_toolbox/KaoriosToolbox.apk" ]; then
-            mkdir -p "$build_dir/system/product/priv-app/KaoriosToolbox"
-            cp "kaorios_toolbox/KaoriosToolbox.apk" "$build_dir/system/product/priv-app/KaoriosToolbox/KaoriosToolbox.apk"
+            mkdir -p "$build_dir/system/priv-app/KaoriosToolbox"
+            cp "kaorios_toolbox/KaoriosToolbox.apk" "$build_dir/system/priv-app/KaoriosToolbox/KaoriosToolbox.apk"
             
             # Extract native libraries
             log "  • Extracting native libraries from APK..."
-            mkdir -p "$build_dir/system/product/priv-app/KaoriosToolbox/lib"
+            mkdir -p "$build_dir/system/priv-app/KaoriosToolbox/lib"
             # Extract lib/arm64-v8a or lib/armeabi-v7a to lib/
-            unzip -q "kaorios_toolbox/KaoriosToolbox.apk" "lib/*" -d "$build_dir/system/product/priv-app/KaoriosToolbox/" || true
+            unzip -q "kaorios_toolbox/KaoriosToolbox.apk" "lib/*" -d "$build_dir/system/priv-app/KaoriosToolbox/" || true
         fi
 
         # 2. Install permissions
         if [ -f "kaorios_toolbox/privapp_whitelist_com.kousei.kaorios.xml" ]; then
-            mkdir -p "$build_dir/system/product/etc/permissions"
-            cp "kaorios_toolbox/privapp_whitelist_com.kousei.kaorios.xml" "$build_dir/system/product/etc/permissions/"
+            mkdir -p "$build_dir/system/etc/permissions"
+            cp "kaorios_toolbox/privapp_whitelist_com.kousei.kaorios.xml" "$build_dir/system/etc/permissions/"
         fi
         
         # 3. Configure system properties
diff --git a/templates/framework-patcher-module b/templates/framework-patcher-module
index aa2a6ad..c4ecc6b 160000
--- a/templates/framework-patcher-module
+++ b/templates/framework-patcher-module
@@ -1 +1 @@
-Subproject commit aa2a6adf74e13ca567d535059f28cab0a23c59c4
+Subproject commit c4ecc6b8720586c13b19507548eb2e88f56d80a9