feat: Update kernel configuration files for Android versions

.github/actions/extract-sublevel-file-name/action.yml

@@ -1,9 +1,24 @@
 name: 'Extract Sublevel and File Name'
 description: 'Reads Makefile sublevel and composes FILE_NAME'
 inputs:
+  kernel_version:
+    required: true
+    type: string
+  android_version:
+    required: true
+    type: string
+  os_patch_level:
+    required: true
+    type: string
   variant:
     required: true
     type: string
+  config_variant:
+    required: false
+    type: string
+  sublevel:
+    required: true
+    type: string
 outputs:
   file_name:
     value: ${{ steps.extract.outputs.file_name }}
@@ -18,13 +33,18 @@ runs:
       run: |
         set -euo pipefail
 
-        SUBLEVEL="${SUB_LEVEL}"
+        SUBLEVEL="${{ inputs.sublevel }}"
         if [ -f "${{ github.workspace }}/kernel/common/Makefile" ]; then
           EXTRACTED="$(grep '^SUBLEVEL = ' "${{ github.workspace }}/kernel/common/Makefile" | awk '{print $3}')"
-          if [ -n "$EXTRACTED" ]; then SUBLEVEL="$EXTRACTED"; fi
+          if [ "${{ inputs.os_patch_level }}" = "lts" ] && [ -n "$EXTRACTED" ]; then
+            SUBLEVEL="$EXTRACTED"
+          fi
         fi
 
-        FILE_NAME="${KERNEL_VERSION}.${SUBLEVEL}-${ANDROID_VERSION}-${OS_PATCH_LEVEL}-${{ inputs.variant }}"
+        FILE_NAME="${{ inputs.kernel_version }}.${SUBLEVEL}-${{ inputs.android_version }}-${{ inputs.os_patch_level }}-${{ inputs.variant }}"
+        if [ -n "${{ inputs.config_variant || '' }}" ]; then
+          FILE_NAME="${FILE_NAME}-${{ inputs.config_variant }}"
+        fi
 
         echo "SUBLEVEL=$SUBLEVEL" >> "$GITHUB_ENV"
         echo "FILE_NAME=$FILE_NAME" >> "$GITHUB_ENV"

.github/actions/misc/action.yml

@@ -10,6 +10,9 @@ inputs:
   sublevel:
     description: 'Sublevel of kernel version (e.g., 1)'
     required: true
+  config_variant:
+    description: 'Optional config variant for extra edits'
+    required: false
 
 runs:
   using: "composite"
@@ -45,9 +48,11 @@ runs:
 
     - name: Add boot time build configs
       shell: bash
+      if: ${{ inputs.config_variant == 'boot-time' }}
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         set -euo pipefail
         cat fs/proc/uptime.c
-        perl -i -pe 's/ktime_get_boottime_ts64\(&uptime\);.+?timens_add_boottime\(&uptime\);/uptime.tv_sec = 330 * 3600;  \/\/ 330 hours\nuptime.tv_nsec = 0;/s' fs/proc/uptime.c
+        sed -i 's/ktime_get_boottime_ts64(&uptime);/uptime.tv_sec = 330 * 3600;/' fs/proc/uptime.c
+        sed -i 's/timens_add_boottime(&uptime);/uptime.tv_nsec = 0;/' fs/proc/uptime.c
         cat fs/proc/uptime.c

.github/config/android12-5.10.json

@@ -1,41 +1,153 @@
 {
+  "version": "android12-5.10",
   "include": [
-    {"kernel_version": "5.10.43-android12-2021-08"},
-    {"kernel_version": "5.10.43-android12-2021-09"},
-    {"kernel_version": "5.10.43-android12-2021-10"},
-    {"kernel_version": "5.10.66-android12-2021-11"},
-    {"kernel_version": "5.10.66-android12-2021-12"},
-    {"kernel_version": "5.10.66-android12-2022-01"},
-    {"kernel_version": "5.10.81-android12-2022-02"},
-    {"kernel_version": "5.10.81-android12-2022-03"},
-    {"kernel_version": "5.10.101-android12-2022-04"},
-    {"kernel_version": "5.10.101-android12-2022-05"},
-    {"kernel_version": "5.10.110-android12-2022-06"},
-    {"kernel_version": "5.10.110-android12-2022-07"},
-    {"kernel_version": "5.10.117-android12-2022-08"},
-    {"kernel_version": "5.10.117-android12-2022-09"},
-    {"kernel_version": "5.10.136-android12-2022-10"},
-    {"kernel_version": "5.10.136-android12-2022-11"},
-    {"kernel_version": "5.10.149-android12-2022-12"},
-    {"kernel_version": "5.10.149-android12-2023-01"},
-    {"kernel_version": "5.10.160-android12-2023-02"},
-    {"kernel_version": "5.10.160-android12-2023-03"},
-    {"kernel_version": "5.10.168-android12-2023-04"},
-    {"kernel_version": "5.10.168-android12-2023-05"},
-    {"kernel_version": "5.10.177-android12-2023-06"},
-    {"kernel_version": "5.10.177-android12-2023-07"},
-    {"kernel_version": "5.10.185-android12-2023-09"},
-    {"kernel_version": "5.10.198-android12-2023-11"},
-    {"kernel_version": "5.10.198-android12-2024-01"},
-    {"kernel_version": "5.10.205-android12-2024-03"},
-    {"kernel_version": "5.10.209-android12-2024-05"},
-    {"kernel_version": "5.10.218-android12-2024-08"},
-    {"kernel_version": "5.10.226-android12-2024-11"},
-    {"kernel_version": "5.10.233-android12-2025-02"},
-    {"kernel_version": "5.10.236-android12-2025-05"},
-    {"kernel_version": "5.10.237-android12-2025-06"},
-    {"kernel_version": "5.10.240-android12-2025-09"},
-    {"kernel_version": "5.10.246-android12-2025-12"},
-    {"kernel_version": "5.10.X-android12-lts"}
+    {
+      "sublevel": "43",
+      "date": "2021-08"
+    },
+    {
+      "sublevel": "43",
+      "date": "2021-09"
+    },
+    {
+      "sublevel": "43",
+      "date": "2021-10"
+    },
+    {
+      "sublevel": "66",
+      "date": "2021-11"
+    },
+    {
+      "sublevel": "66",
+      "date": "2021-12"
+    },
+    {
+      "sublevel": "66",
+      "date": "2022-01"
+    },
+    {
+      "sublevel": "81",
+      "date": "2022-02"
+    },
+    {
+      "sublevel": "81",
+      "date": "2022-03"
+    },
+    {
+      "sublevel": "101",
+      "date": "2022-04"
+    },
+    {
+      "sublevel": "101",
+      "date": "2022-05"
+    },
+    {
+      "sublevel": "110",
+      "date": "2022-06"
+    },
+    {
+      "sublevel": "110",
+      "date": "2022-07"
+    },
+    {
+      "sublevel": "117",
+      "date": "2022-08"
+    },
+    {
+      "sublevel": "117",
+      "date": "2022-09"
+    },
+    {
+      "sublevel": "136",
+      "date": "2022-10"
+    },
+    {
+      "sublevel": "136",
+      "date": "2022-11"
+    },
+    {
+      "sublevel": "149",
+      "date": "2022-12"
+    },
+    {
+      "sublevel": "149",
+      "date": "2023-01"
+    },
+    {
+      "sublevel": "160",
+      "date": "2023-02"
+    },
+    {
+      "sublevel": "160",
+      "date": "2023-03"
+    },
+    {
+      "sublevel": "168",
+      "date": "2023-04"
+    },
+    {
+      "sublevel": "168",
+      "date": "2023-05"
+    },
+    {
+      "sublevel": "177",
+      "date": "2023-06"
+    },
+    {
+      "sublevel": "177",
+      "date": "2023-07"
+    },
+    {
+      "sublevel": "185",
+      "date": "2023-09"
+    },
+    {
+      "sublevel": "198",
+      "date": "2023-11"
+    },
+    {
+      "sublevel": "198",
+      "date": "2024-01"
+    },
+    {
+      "sublevel": "205",
+      "date": "2024-03"
+    },
+    {
+      "sublevel": "209",
+      "date": "2024-05"
+    },
+    {
+      "sublevel": "218",
+      "date": "2024-08"
+    },
+    {
+      "sublevel": "226",
+      "date": "2024-11"
+    },
+    {
+      "sublevel": "233",
+      "date": "2025-02"
+    },
+    {
+      "sublevel": "236",
+      "date": "2025-05"
+    },
+    {
+      "sublevel": "237",
+      "date": "2025-06"
+    },
+    {
+      "sublevel": "240",
+      "date": "2025-09"
+    },
+    {
+      "sublevel": "246",
+      "date": "2025-12"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/config/android13-5.10.json

@@ -1,42 +1,157 @@
 {
+  "version": "android13-5.10",
   "include": [
-    {"kernel_version": "5.10.107-android13-2022-04"},
-    {"kernel_version": "5.10.107-android13-2022-05"},
-    {"kernel_version": "5.10.107-android13-2022-06"},
-    {"kernel_version": "5.10.107-android13-2022-07"},
-    {"kernel_version": "5.10.107-android13-2022-08"},
-    {"kernel_version": "5.10.107-android13-2022-09"},
-    {"kernel_version": "5.10.107-android13-2022-10"},
-    {"kernel_version": "5.10.107-android13-2022-11"},
-    {"kernel_version": "5.10.149-android13-2022-12"},
-    {"kernel_version": "5.10.149-android13-2023-01"},
-    {"kernel_version": "5.10.157-android13-2023-02"},
-    {"kernel_version": "5.10.157-android13-2023-03"},
-    {"kernel_version": "5.10.168-android13-2023-04"},
-    {"kernel_version": "5.10.168-android13-2023-05"},
-    {"kernel_version": "5.10.177-android13-2023-06"},
-    {"kernel_version": "5.10.177-android13-2023-07"},
-    {"kernel_version": "5.10.186-android13-2023-08"},
-    {"kernel_version": "5.10.186-android13-2023-09"},
-    {"kernel_version": "5.10.189-android13-2023-10"},
-    {"kernel_version": "5.10.189-android13-2023-11"},
-    {"kernel_version": "5.10.198-android13-2023-12"},
-    {"kernel_version": "5.10.198-android13-2024-01"},
-    {"kernel_version": "5.10.205-android13-2024-02"},
-    {"kernel_version": "5.10.205-android13-2024-03"},
-    {"kernel_version": "5.10.209-android13-2024-04"},
-    {"kernel_version": "5.10.209-android13-2024-05"},
-    {"kernel_version": "5.10.210-android13-2024-06"},
-    {"kernel_version": "5.10.214-android13-2024-07"},
-    {"kernel_version": "5.10.218-android13-2024-08"},
-    {"kernel_version": "5.10.223-android13-2024-09"},
-    {"kernel_version": "5.10.223-android13-2024-11"},
-    {"kernel_version": "5.10.228-android13-2025-01"},
-    {"kernel_version": "5.10.234-android13-2025-03"},
-    {"kernel_version": "5.10.236-android13-2025-05"},
-    {"kernel_version": "5.10.238-android13-2025-07"},
-    {"kernel_version": "5.10.243-android13-2025-10"},
-    {"kernel_version": "5.10.246-android13-2026-01"},
-    {"kernel_version": "5.10.X-android13-lts"}
+    {
+      "sublevel": "107",
+      "date": "2022-04"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-05"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-06"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-07"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-08"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-09"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-10"
+    },
+    {
+      "sublevel": "107",
+      "date": "2022-11"
+    },
+    {
+      "sublevel": "149",
+      "date": "2022-12"
+    },
+    {
+      "sublevel": "149",
+      "date": "2023-01"
+    },
+    {
+      "sublevel": "157",
+      "date": "2023-02"
+    },
+    {
+      "sublevel": "157",
+      "date": "2023-03"
+    },
+    {
+      "sublevel": "168",
+      "date": "2023-04"
+    },
+    {
+      "sublevel": "168",
+      "date": "2023-05"
+    },
+    {
+      "sublevel": "177",
+      "date": "2023-06"
+    },
+    {
+      "sublevel": "177",
+      "date": "2023-07"
+    },
+    {
+      "sublevel": "186",
+      "date": "2023-08"
+    },
+    {
+      "sublevel": "186",
+      "date": "2023-09"
+    },
+    {
+      "sublevel": "189",
+      "date": "2023-10"
+    },
+    {
+      "sublevel": "189",
+      "date": "2023-11"
+    },
+    {
+      "sublevel": "198",
+      "date": "2023-12"
+    },
+    {
+      "sublevel": "198",
+      "date": "2024-01"
+    },
+    {
+      "sublevel": "205",
+      "date": "2024-02"
+    },
+    {
+      "sublevel": "205",
+      "date": "2024-03"
+    },
+    {
+      "sublevel": "209",
+      "date": "2024-04"
+    },
+    {
+      "sublevel": "209",
+      "date": "2024-05"
+    },
+    {
+      "sublevel": "210",
+      "date": "2024-06"
+    },
+    {
+      "sublevel": "214",
+      "date": "2024-07"
+    },
+    {
+      "sublevel": "218",
+      "date": "2024-08"
+    },
+    {
+      "sublevel": "223",
+      "date": "2024-09"
+    },
+    {
+      "sublevel": "223",
+      "date": "2024-11"
+    },
+    {
+      "sublevel": "228",
+      "date": "2025-01"
+    },
+    {
+      "sublevel": "234",
+      "date": "2025-03"
+    },
+    {
+      "sublevel": "236",
+      "date": "2025-05"
+    },
+    {
+      "sublevel": "238",
+      "date": "2025-07"
+    },
+    {
+      "sublevel": "243",
+      "date": "2025-10"
+    },
+    {
+      "sublevel": "246",
+      "date": "2026-01"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/config/android13-5.15.json

@@ -1,41 +1,154 @@
 {
+  "version": "android13-5.15",
   "include": [
-    {"kernel_version": "5.15.41-android13-2022-06"},
-    {"kernel_version": "5.15.41-android13-2022-07"},
-    {"kernel_version": "5.15.41-android13-2022-08"},
-    {"kernel_version": "5.15.41-android13-2022-09"},
-    {"kernel_version": "5.15.41-android13-2022-10"},
-    {"kernel_version": "5.15.41-android13-2022-11"},
-    {"kernel_version": "5.15.74-android13-2022-12"},
-    {"kernel_version": "5.15.74-android13-2023-01"},
-    {"kernel_version": "5.15.78-android13-2023-02"},
-    {"kernel_version": "5.15.78-android13-2023-03"},
-    {"kernel_version": "5.15.94-android13-2023-04"},
-    {"kernel_version": "5.15.94-android13-2023-05"},
-    {"kernel_version": "5.15.104-android13-2023-06"},
-    {"kernel_version": "5.15.104-android13-2023-07"},
-    {"kernel_version": "5.15.119-android13-2023-08"},
-    {"kernel_version": "5.15.119-android13-2023-09"},
-    {"kernel_version": "5.15.123-android13-2023-10"},
-    {"kernel_version": "5.15.123-android13-2023-11"},
-    {"kernel_version": "5.15.137-android13-2023-12"},
-    {"kernel_version": "5.15.137-android13-2024-01"},
-    {"kernel_version": "5.15.144-android13-2024-02"},
-    {"kernel_version": "5.15.144-android13-2024-03"},
-    {"kernel_version": "5.15.148-android13-2024-04"},
-    {"kernel_version": "5.15.148-android13-2024-05"},
-    {"kernel_version": "5.15.149-android13-2024-06"},
-    {"kernel_version": "5.15.149-android13-2024-07"},
-    {"kernel_version": "5.15.151-android13-2024-08"},
-    {"kernel_version": "5.15.153-android13-2024-09"},
-    {"kernel_version": "5.15.167-android13-2024-11"},
-    {"kernel_version": "5.15.170-android13-2025-01"},
-    {"kernel_version": "5.15.178-android13-2025-03"},
-    {"kernel_version": "5.15.180-android13-2025-05"},
-    {"kernel_version": "5.15.185-android13-2025-07"},
-    {"kernel_version": "5.15.189-android13-2025-09"},
-    {"kernel_version": "5.15.194-android13-2025-12"},
-    {"kernel_version": "5.15.197-android13-2026-03"},
-    {"kernel_version": "5.15.X-android13-lts"}
+    {
+      "sublevel": "41",
+      "date": "2022-06"
+    },
+    {
+      "sublevel": "41",
+      "date": "2022-07"
+    },
+    {
+      "sublevel": "41",
+      "date": "2022-08"
+    },
+    {
+      "sublevel": "41",
+      "date": "2022-09"
+    },
+    {
+      "sublevel": "41",
+      "date": "2022-10"
+    },
+    {
+      "sublevel": "41",
+      "date": "2022-11"
+    },
+    {
+      "sublevel": "74",
+      "date": "2022-12"
+    },
+    {
+      "sublevel": "74",
+      "date": "2023-01"
+    },
+    {
+      "sublevel": "78",
+      "date": "2023-02"
+    },
+    {
+      "sublevel": "78",
+      "date": "2023-03"
+    },
+    {
+      "sublevel": "94",
+      "date": "2023-04"
+    },
+    {
+      "sublevel": "94",
+      "date": "2023-05"
+    },
+    {
+      "sublevel": "104",
+      "date": "2023-06"
+    },
+    {
+      "sublevel": "104",
+      "date": "2023-07"
+    },
+    {
+      "sublevel": "119",
+      "date": "2023-08"
+    },
+    {
+      "sublevel": "119",
+      "date": "2023-09"
+    },
+    {
+      "sublevel": "123",
+      "date": "2023-10"
+    },
+    {
+      "sublevel": "123",
+      "date": "2023-11"
+    },
+    {
+      "sublevel": "137",
+      "date": "2023-12"
+    },
+    {
+      "sublevel": "137",
+      "date": "2024-01"
+    },
+    {
+      "sublevel": "144",
+      "date": "2024-02"
+    },
+    {
+      "sublevel": "144",
+      "date": "2024-03"
+    },
+    {
+      "sublevel": "148",
+      "date": "2024-04"
+    },
+    {
+      "sublevel": "148",
+      "date": "2024-05"
+    },
+    {
+      "sublevel": "149",
+      "date": "2024-06"
+    },
+    {
+      "sublevel": "149",
+      "date": "2024-07"
+    },
+    {
+      "sublevel": "151",
+      "date": "2024-08"
+    },
+    {
+      "sublevel": "153",
+      "date": "2024-09"
+    },
+    {
+      "sublevel": "167",
+      "date": "2024-11"
+    },
+    {
+      "sublevel": "170",
+      "date": "2025-01"
+    },
+    {
+      "sublevel": "178",
+      "date": "2025-03"
+    },
+    {
+      "sublevel": "180",
+      "date": "2025-05"
+    },
+    {
+      "sublevel": "185",
+      "date": "2025-07"
+    },
+    {
+      "sublevel": "189",
+      "date": "2025-09",
+      "variant": "boot-time"
+    },
+    {
+      "sublevel": "194",
+      "date": "2025-12"
+    },
+    {
+      "sublevel": "197",
+      "date": "2026-03"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/config/android14-5.15.json

@@ -1,26 +1,93 @@
 {
+  "version": "android14-5.15",
   "include": [
-    {"kernel_version": "5.15.110-android14-2023-06"},
-    {"kernel_version": "5.15.110-android14-2023-08"},
-    {"kernel_version": "5.15.110-android14-2023-09"},
-    {"kernel_version": "5.15.131-android14-2023-11"},
-    {"kernel_version": "5.15.137-android14-2024-01"},
-    {"kernel_version": "5.15.144-android14-2024-02"},
-    {"kernel_version": "5.15.144-android14-2024-03"},
-    {"kernel_version": "5.15.148-android14-2024-04"},
-    {"kernel_version": "5.15.148-android14-2024-05"},
-    {"kernel_version": "5.15.149-android14-2024-06"},
-    {"kernel_version": "5.15.153-android14-2024-07"},
-    {"kernel_version": "5.15.158-android14-2024-08"},
-    {"kernel_version": "5.15.164-android14-2024-09"},
-    {"kernel_version": "5.15.167-android14-2024-11"},
-    {"kernel_version": "5.15.170-android14-2025-01"},
-    {"kernel_version": "5.15.178-android14-2025-03"},
-    {"kernel_version": "5.15.180-android14-2025-05"},
-    {"kernel_version": "5.15.185-android14-2025-07"},
-    {"kernel_version": "5.15.192-android14-2025-10"},
-    {"kernel_version": "5.15.196-android14-2026-01"},
-    {"kernel_version": "5.15.202-android14-2026-04"},
-    {"kernel_version": "5.15.X-android14-lts"}
+    {
+      "sublevel": "110",
+      "date": "2023-06"
+    },
+    {
+      "sublevel": "110",
+      "date": "2023-08"
+    },
+    {
+      "sublevel": "110",
+      "date": "2023-09"
+    },
+    {
+      "sublevel": "131",
+      "date": "2023-11"
+    },
+    {
+      "sublevel": "137",
+      "date": "2024-01"
+    },
+    {
+      "sublevel": "144",
+      "date": "2024-02"
+    },
+    {
+      "sublevel": "144",
+      "date": "2024-03"
+    },
+    {
+      "sublevel": "148",
+      "date": "2024-04"
+    },
+    {
+      "sublevel": "148",
+      "date": "2024-05"
+    },
+    {
+      "sublevel": "149",
+      "date": "2024-06"
+    },
+    {
+      "sublevel": "153",
+      "date": "2024-07"
+    },
+    {
+      "sublevel": "158",
+      "date": "2024-08"
+    },
+    {
+      "sublevel": "164",
+      "date": "2024-09"
+    },
+    {
+      "sublevel": "167",
+      "date": "2024-11"
+    },
+    {
+      "sublevel": "170",
+      "date": "2025-01"
+    },
+    {
+      "sublevel": "178",
+      "date": "2025-03"
+    },
+    {
+      "sublevel": "180",
+      "date": "2025-05"
+    },
+    {
+      "sublevel": "185",
+      "date": "2025-07"
+    },
+    {
+      "sublevel": "192",
+      "date": "2025-10"
+    },
+    {
+      "sublevel": "196",
+      "date": "2026-01"
+    },
+    {
+      "sublevel": "202",
+      "date": "2026-04"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/config/android14-6.1.json

@@ -1,35 +1,129 @@
 {
+  "version": "android14-6.1",
   "include": [
-    {"kernel_version": "6.1.25-android14-2023-06"},
-    {"kernel_version": "6.1.25-android14-2023-07"},
-    {"kernel_version": "6.1.25-android14-2023-08"},
-    {"kernel_version": "6.1.25-android14-2023-09"},
-    {"kernel_version": "6.1.25-android14-2023-10"},
-    {"kernel_version": "6.1.43-android14-2023-11"},
-    {"kernel_version": "6.1.57-android14-2023-12"},
-    {"kernel_version": "6.1.57-android14-2024-01"},
-    {"kernel_version": "6.1.68-android14-2024-02"},
-    {"kernel_version": "6.1.68-android14-2024-03"},
-    {"kernel_version": "6.1.75-android14-2024-04"},
-    {"kernel_version": "6.1.75-android14-2024-05"},
-    {"kernel_version": "6.1.78-android14-2024-06"},
-    {"kernel_version": "6.1.84-android14-2024-07"},
-    {"kernel_version": "6.1.90-android14-2024-08"},
-    {"kernel_version": "6.1.93-android14-2024-09"},
-    {"kernel_version": "6.1.99-android14-2024-10"},
-    {"kernel_version": "6.1.112-android14-2024-11"},
-    {"kernel_version": "6.1.115-android14-2024-12"},
-    {"kernel_version": "6.1.118-android14-2025-01"},
-    {"kernel_version": "6.1.124-android14-2025-02"},
-    {"kernel_version": "6.1.128-android14-2025-03"},
-    {"kernel_version": "6.1.129-android14-2025-04"},
-    {"kernel_version": "6.1.134-android14-2025-05"},
-    {"kernel_version": "6.1.138-android14-2025-06"},
-    {"kernel_version": "6.1.141-android14-2025-07"},
-    {"kernel_version": "6.1.145-android14-2025-08"},
-    {"kernel_version": "6.1.145-android14-2025-09"},
-    {"kernel_version": "6.1.157-android14-2025-12"},
-    {"kernel_version": "6.1.162-android14-2026-03"},
-    {"kernel_version": "6.1.X-android14-lts"}
+    {
+      "sublevel": "25",
+      "date": "2023-06"
+    },
+    {
+      "sublevel": "25",
+      "date": "2023-07"
+    },
+    {
+      "sublevel": "25",
+      "date": "2023-08"
+    },
+    {
+      "sublevel": "25",
+      "date": "2023-09"
+    },
+    {
+      "sublevel": "25",
+      "date": "2023-10"
+    },
+    {
+      "sublevel": "43",
+      "date": "2023-11"
+    },
+    {
+      "sublevel": "57",
+      "date": "2023-12"
+    },
+    {
+      "sublevel": "57",
+      "date": "2024-01"
+    },
+    {
+      "sublevel": "68",
+      "date": "2024-02"
+    },
+    {
+      "sublevel": "68",
+      "date": "2024-03"
+    },
+    {
+      "sublevel": "75",
+      "date": "2024-04"
+    },
+    {
+      "sublevel": "75",
+      "date": "2024-05"
+    },
+    {
+      "sublevel": "78",
+      "date": "2024-06"
+    },
+    {
+      "sublevel": "84",
+      "date": "2024-07"
+    },
+    {
+      "sublevel": "90",
+      "date": "2024-08"
+    },
+    {
+      "sublevel": "93",
+      "date": "2024-09"
+    },
+    {
+      "sublevel": "99",
+      "date": "2024-10"
+    },
+    {
+      "sublevel": "112",
+      "date": "2024-11"
+    },
+    {
+      "sublevel": "115",
+      "date": "2024-12"
+    },
+    {
+      "sublevel": "118",
+      "date": "2025-01"
+    },
+    {
+      "sublevel": "124",
+      "date": "2025-02"
+    },
+    {
+      "sublevel": "128",
+      "date": "2025-03"
+    },
+    {
+      "sublevel": "129",
+      "date": "2025-04"
+    },
+    {
+      "sublevel": "134",
+      "date": "2025-05"
+    },
+    {
+      "sublevel": "138",
+      "date": "2025-06"
+    },
+    {
+      "sublevel": "141",
+      "date": "2025-07"
+    },
+    {
+      "sublevel": "145",
+      "date": "2025-08"
+    },
+    {
+      "sublevel": "145",
+      "date": "2025-09"
+    },
+    {
+      "sublevel": "157",
+      "date": "2025-12"
+    },
+    {
+      "sublevel": "162",
+      "date": "2026-03"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/config/android15-6.6.json

@@ -1,23 +1,81 @@
 {
+  "version": "android15-6.6",
   "include": [
-    {"kernel_version": "6.6.30-android15-2024-07"},
-    {"kernel_version": "6.6.30-android15-2024-08"},
-    {"kernel_version": "6.6.46-android15-2024-09"},
-    {"kernel_version": "6.6.50-android15-2024-10"},
-    {"kernel_version": "6.6.56-android15-2024-11"},
-    {"kernel_version": "6.6.57-android15-2024-12"},
-    {"kernel_version": "6.6.58-android15-2025-01"},
-    {"kernel_version": "6.6.66-android15-2025-02"},
-    {"kernel_version": "6.6.77-android15-2025-03"},
-    {"kernel_version": "6.6.82-android15-2025-04"},
-    {"kernel_version": "6.6.87-android15-2025-05"},
-    {"kernel_version": "6.6.89-android15-2025-06"},
-    {"kernel_version": "6.6.92-android15-2025-07"},
-    {"kernel_version": "6.6.98-android15-2025-08"},
-    {"kernel_version": "6.6.98-android15-2025-09"},
-    {"kernel_version": "6.6.102-android15-2025-10"},
-    {"kernel_version": "6.6.118-android15-2026-01"},
-    {"kernel_version": "6.6.127-android15-2026-04"},
-    {"kernel_version": "6.6.X-android15-lts"}
+    {
+      "sublevel": "30",
+      "date": "2024-07"
+    },
+    {
+      "sublevel": "30",
+      "date": "2024-08"
+    },
+    {
+      "sublevel": "46",
+      "date": "2024-09"
+    },
+    {
+      "sublevel": "50",
+      "date": "2024-10"
+    },
+    {
+      "sublevel": "56",
+      "date": "2024-11"
+    },
+    {
+      "sublevel": "57",
+      "date": "2024-12"
+    },
+    {
+      "sublevel": "58",
+      "date": "2025-01"
+    },
+    {
+      "sublevel": "66",
+      "date": "2025-02"
+    },
+    {
+      "sublevel": "77",
+      "date": "2025-03"
+    },
+    {
+      "sublevel": "82",
+      "date": "2025-04"
+    },
+    {
+      "sublevel": "87",
+      "date": "2025-05"
+    },
+    {
+      "sublevel": "89",
+      "date": "2025-06"
+    },
+    {
+      "sublevel": "92",
+      "date": "2025-07"
+    },
+    {
+      "sublevel": "98",
+      "date": "2025-08"
+    },
+    {
+      "sublevel": "98",
+      "date": "2025-09"
+    },
+    {
+      "sublevel": "102",
+      "date": "2025-10"
+    },
+    {
+      "sublevel": "118",
+      "date": "2026-01"
+    },
+    {
+      "sublevel": "127",
+      "date": "2026-04"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/config/android16-6.12.json

@@ -1,12 +1,38 @@
 {
+  "version": "android16-6.12",
   "include": [
-    {"kernel_version": "6.12.23-android16-2025-05-exp"},
-    {"kernel_version": "6.12.23-android16-2025-06"},
-    {"kernel_version": "6.12.30-android16-2025-07"},
-    {"kernel_version": "6.12.38-android16-2025-08"},
-    {"kernel_version": "6.12.38-android16-2025-09"},
-    {"kernel_version": "6.12.58-android16-2025-12"},
-    {"kernel_version": "6.12.69-android16-2026-03"},
-    {"kernel_version": "6.12.X-android16-lts"}
+    {
+      "sublevel": "23",
+      "date": "2025-05",
+      "variant": "exp"
+    },
+    {
+      "sublevel": "23",
+      "date": "2025-06"
+    },
+    {
+      "sublevel": "30",
+      "date": "2025-07"
+    },
+    {
+      "sublevel": "38",
+      "date": "2025-08"
+    },
+    {
+      "sublevel": "38",
+      "date": "2025-09"
+    },
+    {
+      "sublevel": "58",
+      "date": "2025-12"
+    },
+    {
+      "sublevel": "69",
+      "date": "2026-03"
+    },
+    {
+      "sublevel": "X",
+      "date": "lts"
+    }
   ]
 }

.github/workflows/build.yml

@@ -6,12 +6,24 @@ permissions:
 on:
   workflow_call:
     inputs:
+      android_version:
+        required: true
+        type: string
       kernel_version:
         required: true
         type: string
+      sublevel:
+        required: true
+        type: string
+      os_patch_level:
+        required: true
+        type: string
       variant:
         required: false
         type: string
+      config_variant:
+        required: false
+        type: string
       feature_set:
         required: true
         type: string
@@ -21,7 +33,7 @@ on:
 
 jobs:
   build-gki:
-    name: "${{ inputs.kernel_version }} (${{ inputs.variant }})"
+    name: "${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ inputs.sublevel }}-${{ inputs.os_patch_level }} (${{ inputs.variant }} / ${{ inputs.config_variant || 'base' }})"
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -29,12 +41,6 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v5
 
-    - name: Parse kernel version
-      id: parse
-      uses: ./.github/actions/parse-kernel-version
-      with:
-        kernel_version: ${{ inputs.kernel_version }}
-
     - name: Free Disk Space
       if: false
       uses: endersonmenezes/free-disk-space@v3  # Use @main for latest, @v3 for stable
@@ -64,24 +70,29 @@ jobs:
     - name: Download Kernel Repository
       uses: ./.github/actions/download-kernel
       with:
-        android_version: ${{ steps.parse.outputs.android_version }}
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
-        os_patch_level: ${{ steps.parse.outputs.os_patch_level }}
+        android_version: ${{ inputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        os_patch_level: ${{ inputs.os_patch_level }}
         use_repo: ${{ inputs.use_repo }}
 
     - name: Extract Sublevel and Set File Name
       id: extract
       uses: ./.github/actions/extract-sublevel-file-name
       with:
+        android_version: ${{ inputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        sublevel: ${{ inputs.sublevel }}
+        os_patch_level: ${{ inputs.os_patch_level }}
         variant: ${{ inputs.variant }}
+        config_variant: ${{ inputs.config_variant }}
 
     - name: Kernel Fixes
       uses: ./.github/actions/kernel-fixes
       with:
-        android_version: ${{ steps.parse.outputs.android_version }}
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
+        android_version: ${{ inputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
         sublevel: ${{ steps.extract.outputs.sublevel }}
-        os_patch_level: ${{ steps.parse.outputs.os_patch_level }}
+        os_patch_level: ${{ inputs.os_patch_level }}
 
     - name: Setup KernelSU-Next
       if: contains(inputs.feature_set, 'KSUN') || inputs.feature_set == 'FULL'
@@ -91,9 +102,9 @@ jobs:
       if: contains(inputs.feature_set, 'SUSFS') || inputs.feature_set == 'FULL'
       uses: ./.github/actions/susfs
       with:
-        android_version: ${{ steps.parse.outputs.android_version }}
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
-        os_patch_level: ${{ steps.parse.outputs.os_patch_level }}
+        android_version: ${{ inputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        os_patch_level: ${{ inputs.os_patch_level }}
         sublevel: ${{ steps.extract.outputs.sublevel }}
 
     - name: Baseband Guard
@@ -104,32 +115,33 @@ jobs:
       if: contains(inputs.feature_set, 'NET') || inputs.feature_set == 'FULL'
       uses: ./.github/actions/networking
       with:
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
-        android_version: ${{ steps.parse.outputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        android_version: ${{ inputs.android_version }}
 
     - name: DroidSpaces-OSS Patches
       if: contains(inputs.feature_set, 'DS') || inputs.feature_set == 'FULL'
       uses: ./.github/actions/droidspaces
       with:
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
+        kernel_version: ${{ inputs.kernel_version }}
 
     - name: Setup Misc Configs
       uses: ./.github/actions/misc
       with:
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
-        android_version: ${{ steps.parse.outputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        android_version: ${{ inputs.android_version }}
         sublevel: ${{ steps.extract.outputs.sublevel }}
+        config_variant: ${{ inputs.config_variant }}
 
     - name: Apply Module Check Bypass
       if: ${{ inputs.variant == 'Bypass' }}
       uses: ./.github/actions/module-check-bypass
       with:
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
+        kernel_version: ${{ inputs.kernel_version }}
 
     - name: Apply Device-Specific Patches
       uses: ./.github/actions/apply-device-patches
       with:
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
+        kernel_version: ${{ inputs.kernel_version }}
 
     - name: Apply ABI Compare Bypass
       if: false
@@ -155,8 +167,8 @@ jobs:
       uses: ./.github/actions/apply-kernel-branding
       with:
         variant: ${{ inputs.variant }}
-        kernel_version: ${{ steps.parse.outputs.kernel_version }}
-        android_version: ${{ steps.parse.outputs.android_version }}
+        kernel_version: ${{ inputs.kernel_version }}
+        android_version: ${{ inputs.android_version }}
         sublevel: ${{ steps.extract.outputs.sublevel }}
 
     - name: Remove Protected Exports

.github/workflows/prepare.yml

@@ -52,12 +52,35 @@ jobs:
           FINAL=$(jq -cn \
             --argjson cfg "$CONFIG_JSON" \
             --argjson variants "$VARIANTS" '
-            {
-              include: [
-                $cfg.include[] as $item
-                | $variants[] as $variant
-                | $item + {variant: $variant}
-              ]
+            def dedup($items): reduce $items[] as $item ([]; if any(.[]; . == $item) then . else . + [$item] end);
+
+            ($cfg.version | split("-")) as $version_parts
+            | {
+              include: (
+                [
+                  $cfg.include[] as $item
+                  | $variants[] as $build_variant
+                  | {
+                      android_version: $version_parts[0],
+                      kernel_version: $version_parts[1],
+                      sublevel: $item.sublevel,
+                      os_patch_level: $item.date,
+                      variant: $build_variant
+                    }
+                ]
+                + [
+                  $cfg.include[]
+                  | select(.variant != null)
+                  | {
+                      android_version: $version_parts[0],
+                      kernel_version: $version_parts[1],
+                      sublevel: .sublevel,
+                      os_patch_level: .date,
+                      variant: "Normal",
+                      config_variant: .variant
+                    }
+                ]
+              )
             }')
 
           echo "matrix=$FINAL" >> "$GITHUB_OUTPUT"
@@ -69,8 +92,12 @@ jobs:
       matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
     uses: ./.github/workflows/build.yml
     with:
+      android_version: ${{ matrix.android_version }}
       kernel_version: ${{ matrix.kernel_version }}
-      variant: ${{ inputs.variant }}
+      sublevel: ${{ matrix.sublevel }}
+      os_patch_level: ${{ matrix.os_patch_level }}
+      variant: ${{ matrix.variant }}
+      config_variant: ${{ matrix.config_variant || '' }}
       feature_set: ${{ inputs.feature_set }}
       use_repo: ${{ inputs.use_repo }}
     secrets: inherit