build: wire android stl headers and persist bazel cache

Author: Apricityx

.github/workflows/build-android-arm64.yml

@@ -38,27 +38,29 @@ jobs:
             "ndk;${ANDROID_NDK_VERSION}"
 
       - name: Restore Bazel Repository Cache
-        uses: actions/cache@v4
+        id: restore_bazel_repository_cache
+        uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/.bazel-cache/repository
-          key: ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py', '.github/workflows/build-android-arm64.yml') }}
+          key: ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py') }}
           restore-keys: |
             ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-
             ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-
 
       - name: Restore Bazel Disk Cache
-        uses: actions/cache@v4
+        id: restore_bazel_disk_cache
+        uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/.bazel-cache/disk
-          key: ${{ runner.os }}-bazel-disk-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py', '.github/workflows/build-android-arm64.yml') }}
+          key: ${{ runner.os }}-bazel-disk-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py') }}
           restore-keys: |
             ${{ runner.os }}-bazel-disk-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-
             ${{ runner.os }}-bazel-disk-${{ env.ANDROID_PLATFORM }}-
 
       - name: Clone TensorFlow Java
         shell: bash
         run: |
-          git clone https://github.com/tensorflow/java.git tfjava
+          git clone --filter=blob:none --no-checkout https://github.com/tensorflow/java.git tfjava
           cd tfjava
           git checkout "${TFJAVA_COMMIT}"
 
@@ -251,6 +253,20 @@ jobs:
             (cd "${GITHUB_WORKSPACE}/artifacts/output" && find . -type f -print0 | sort -z | xargs -0 sha256sum) > "${GITHUB_WORKSPACE}/artifacts/sha256.txt" || true
           fi
 
+      - name: Save Bazel Repository Cache
+        if: always() && steps.restore_bazel_repository_cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/.bazel-cache/repository
+          key: ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py') }}
+
+      - name: Save Bazel Disk Cache
+        if: always() && steps.restore_bazel_disk_cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/.bazel-cache/disk
+          key: ${{ runner.os }}-bazel-disk-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py') }}
+
       - name: Upload Artifacts
         if: always()
         uses: actions/upload-artifact@v4

scripts/patch_tfjava.py

@@ -14,10 +14,19 @@ def replace_once(text: str, old: str, new: str, path: Path) -> str:
 def patch_module_pom(path: Path) -> None:
     text = path.read_text(encoding="utf-8")
     if "<PLATFORM>${javacpp.platform}</PLATFORM>" in text:
-        return
-    old = "<EXTENSION>${javacpp.platform.extension}</EXTENSION>"
-    new = """<EXTENSION>${javacpp.platform.extension}</EXTENSION>\n                <PLATFORM>${javacpp.platform}</PLATFORM>"""
-    text = replace_once(text, old, new, path)
+        pass
+    else:
+        old = "<EXTENSION>${javacpp.platform.extension}</EXTENSION>"
+        new = """<EXTENSION>${javacpp.platform.extension}</EXTENSION>\n                <PLATFORM>${javacpp.platform}</PLATFORM>"""
+        text = replace_once(text, old, new, path)
+    if "${env.ANDROID_NDK_HOME}/sources/cxx-stl/gnu-libstdc++/4.9/include" not in text:
+        old = """          <includePaths>\n            <includePath>${project.basedir}/</includePath>\n            <includePath>${project.basedir}/bazel-${project.artifactId}/external/org_tensorflow/</includePath>\n          </includePaths>\n"""
+        new = """          <includePaths>\n            <includePath>${project.basedir}/</includePath>\n            <includePath>${project.basedir}/bazel-${project.artifactId}/external/org_tensorflow/</includePath>\n            <includePath>${env.ANDROID_NDK_HOME}/sources/cxx-stl/gnu-libstdc++/4.9/include</includePath>\n            <includePath>${env.ANDROID_NDK_HOME}/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include</includePath>\n          </includePaths>\n"""
+        text = replace_once(text, old, new, path)
+    if "${env.ANDROID_NDK_HOME}/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a" not in text:
+        old = """          <linkPaths>\n            <linkPath>${project.basedir}/bazel-bin/external/org_tensorflow/tensorflow/</linkPath>\n          </linkPaths>\n"""
+        new = """          <linkPaths>\n            <linkPath>${project.basedir}/bazel-bin/external/org_tensorflow/tensorflow/</linkPath>\n            <linkPath>${env.ANDROID_NDK_HOME}/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a</linkPath>\n          </linkPaths>\n"""
+        text = replace_once(text, old, new, path)
     path.write_text(text, encoding="utf-8")