Expanded Docker image rebuild triggers for native sources.

Author: 23rd

.github/workflows/docker-builder.yml

@@ -5,10 +5,19 @@ on:
     paths:
       - 'docker/Dockerfile'
       - '.github/workflows/docker-builder.yml'
+      - 'TMessagesProj/jni/boringssl'
+      - 'TMessagesProj/jni/ffmpeg'
+      - 'TMessagesProj/jni/libvpx'
+      - 'TMessagesProj/jni/dav1d'
+      - 'TMessagesProj/jni/tde2e_source'
+      - 'TMessagesProj/jni/patches/**'
+      - 'TMessagesProj/jni/build_*.sh'
+      - 'TMessagesProj/jni/prepare.py'
+      - 'TMessagesProj/jni/CMakeLists.txt'
+      - 'TMessagesProj/jni/voip/**'
     branches:
       - dev
   schedule:
-    # First Sunday of each month at 03:00 UTC
     - cron: '0 3 1-7 * 0'
   workflow_dispatch:
 
@@ -23,8 +32,23 @@ jobs:
       packages: write
 
     steps:
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        with:
+          tool-cache: true
+          android: true
+
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Clone untracked submodules (boringssl, ffmpeg)
+        run: |
+          git clone https://github.com/google/boringssl TMessagesProj/jni/boringssl
+          cd TMessagesProj/jni/boringssl && git checkout a6d321b11fa80496b7c8ae6405468c212d4f5c87 && cd -
+          git clone https://github.com/FFmpeg/FFmpeg TMessagesProj/jni/ffmpeg
+          cd TMessagesProj/jni/ffmpeg && git checkout 71fb6132637a2a430375c24afc381fff8b854fe7 && cd -
 
       - name: Lowercase image name
         id: lower
@@ -40,7 +64,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: docker
+          context: .
           file: docker/Dockerfile
           push: true
           tags: |

docker/Dockerfile

@@ -59,10 +59,12 @@ RUN yes | sdkmanager --licenses > /dev/null 2>&1 && \
       "build-tools;35.0.0" \
       "ndk;21.4.7075529" \
       "ndk;23.2.8568313" \
-      "cmake;3.10.2.4988404"
+      "cmake;3.10.2.4988404" \
+      "cmake;3.22.1"
 
-RUN ln -sf /opt/android-sdk/cmake/3.10.2.4988404/bin/cmake /usr/local/bin/cmake && \
-    ln -sf /opt/android-sdk/cmake/3.10.2.4988404/bin/cmake /usr/local/bin/cmake3
+# cmake 3.10.2 for Gradle compatibility, cmake 3.22.1 for standalone builds
+RUN ln -sf /opt/android-sdk/cmake/3.22.1/bin/cmake /usr/local/bin/cmake && \
+    ln -sf /opt/android-sdk/cmake/3.22.1/bin/cmake /usr/local/bin/cmake3
 
 # ============================================================
 # Stage 2: Build native libraries
@@ -72,13 +74,40 @@ FROM base AS native-builder
 COPY TMessagesProj/jni/ /build/jni/
 WORKDIR /build/jni
 
-# Phase 1: prepare.py (boringssl, ffmpeg, libvpx, dav1d, tde2e)
-# Stub out git — prepare.py runs "git submodule update" and "git reset --hard"
-# but the sources are already in place via COPY.
-RUN mv /usr/bin/git /usr/bin/git.real && \
-    printf '#!/bin/sh\ntrue\n' > /usr/bin/git && chmod +x /usr/bin/git && \
-    python3 prepare.py arm64 arm ndk=$ANDROID_NDK_HOME silent && \
-    mv /usr/bin/git.real /usr/bin/git
+# Phase 1: Build static libraries directly (bypasses prepare.py which
+# assumes git submodules and rm/re-checkout cycle unsuitable for Docker).
+ENV NDK=$ANDROID_NDK_HOME
+ENV NINJA_PATH=/usr/bin/ninja
+
+RUN ./build_dav1d_clang.sh arm64 arm
+
+RUN ./build_libvpx_clang.sh arm64 arm
+
+RUN ./build_ffmpeg_clang.sh arm64 arm && ./patch_ffmpeg.sh
+
+RUN ./patch_boringssl.sh && ./build_boringssl.sh arm64 arm
+
+RUN tde2e_dir=$(pwd)/tde2e && \
+    source_dir=$(pwd)/tde2e_source && \
+    boringssl_dir=$(pwd)/boringssl && \
+    for arch in arm64-v8a armeabi-v7a; do \
+      mkdir -p $source_dir/example/android/third-party/openssl/$arch/lib/ && \
+      cp "$boringssl_dir/build/$arch/crypto/libcrypto.a" "$source_dir/example/android/third-party/openssl/$arch/lib/" && \
+      cp "$boringssl_dir/build/$arch/ssl/libssl.a" "$source_dir/example/android/third-party/openssl/$arch/lib/" && \
+      cp -R "$boringssl_dir/include" "$source_dir/example/android/third-party/openssl/$arch/"; \
+    done && \
+    cp "$tde2e_dir/build-tdlib.sh" "$source_dir/example/android/." && \
+    cp "$tde2e_dir/CMakeLists.txt" "$source_dir/example/android/." && \
+    sed -i "s/ php//g" "$source_dir/example/android/check-environment.sh" && \
+    sed -i "s/PHP_EXECUTABLE/FALSE/g" "$source_dir/td/generate/CMakeLists.txt" && \
+    cd "$source_dir/example/android" && \
+    SED_CMDS="s/x86_64//g;s/x86//g;s/rm tdlib/# rm tdlib/g;s/jar/# jar/g;s/mv tdlib/# mv tdlib/g;" && \
+    sed "$SED_CMDS" ./build-tdlib.sh | bash -s -- "$NDK/../.." && \
+    for arch in arm64-v8a armeabi-v7a; do \
+      mkdir -p $tde2e_dir/$arch && \
+      cp "$source_dir/example/android/build-$arch-Java/td/tde2e/libtde2e.a" $tde2e_dir/$arch && \
+      cp "$source_dir/example/android/build-$arch-Java/td/tdutils/libtdutils.a" $tde2e_dir/$arch; \
+    done
 
 # Phase 2: CMake build of libtmessages.49.so per ABI
 RUN for abi in arm64-v8a armeabi-v7a; do \