Fix cache key format: include android_version prefix

Format: android_version-kernel_version.sublevel-os_patch_level
Example: android12-5.10.101-2022-04, android14-6.1.145-2025-09

.github/workflows/build.yml

@@ -213,12 +213,12 @@ jobs:
       uses: ./.github/actions/cache-restore
       with:
         cache_path: /home/runner/.ccache
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: ccache-cache
         compression_level: 9
         restore_keys: |
-          ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
-          ${{ inputs.kernel_version }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}-
 
     - name: Restore lto-cache (ccache versions)
       id: restore-lto-ccache
@@ -229,12 +229,12 @@ jobs:
       uses: ./.github/actions/cache-restore
       with:
         cache_path: /home/runner/.ld_cache
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: lto-cache
         compression_level: 9
         restore_keys: |
-          ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
-          ${{ inputs.kernel_version }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}-
 
     - name: Restore bazel-cache
       id: restore-bazel
@@ -246,12 +246,12 @@ jobs:
       uses: ./.github/actions/cache-restore
       with:
         cache_path: /home/runner/.cache/bazel
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: bazel-cache
         compression_level: 9
         restore_keys: |
-          ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
-          ${{ inputs.kernel_version }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}-
 
     - name: Restore lto-cache (bazel versions)
       id: restore-lto-bazel
@@ -263,12 +263,12 @@ jobs:
       uses: ./.github/actions/cache-restore
       with:
         cache_path: /home/runner/.ld_cache
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: lto-cache
         compression_level: 9
         restore_keys: |
-          ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
-          ${{ inputs.kernel_version }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-
+          ${{ inputs.android_version }}-${{ inputs.kernel_version }}-
 
     - name: Check cache hit
       run: |
@@ -305,7 +305,7 @@ jobs:
       uses: ./.github/actions/cache-save
       with:
         cache_path: /home/runner/.ccache
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: ccache-cache
         compression_level: 9
         github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -318,7 +318,7 @@ jobs:
       uses: ./.github/actions/cache-save
       with:
         cache_path: /home/runner/.ld_cache
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: lto-cache
         compression_level: 9
         github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -332,7 +332,7 @@ jobs:
       uses: ./.github/actions/cache-save
       with:
         cache_path: /home/runner/.cache/bazel
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: bazel-cache
         compression_level: 9
         github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -346,7 +346,7 @@ jobs:
       uses: ./.github/actions/cache-save
       with:
         cache_path: /home/runner/.ld_cache
-        cache_key: ${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
+        cache_key: ${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ steps.extract.outputs.sublevel }}-${{ inputs.os_patch_level }}
         cache_bucket: lto-cache
         compression_level: 9
         github_token: ${{ secrets.GITHUB_TOKEN }}