Skipped prepare.py when Phase 1 artifacts are already present.

Author: 23rd

.github/workflows/tandroid.yml

@@ -60,16 +60,20 @@ jobs:
           if [ -d /prebuilt/boringssl ]; then
             echo "Copying cached Phase 1 native artifacts from Docker image"
             for lib in boringssl ffmpeg libvpx dav1d; do
-              if [ -d "/prebuilt/$lib/build" ]; then
-                cp -r /prebuilt/$lib/build TMessagesProj/jni/$lib/
-              fi
+              mkdir -p TMessagesProj/jni/$lib
+              for subdir in build include; do
+                if [ -d "/prebuilt/$lib/$subdir" ]; then
+                  cp -r /prebuilt/$lib/$subdir TMessagesProj/jni/$lib/
+                fi
+              done
             done
             for arch in arm64-v8a armeabi-v7a; do
               if [ -d "/prebuilt/tde2e/$arch" ]; then
                 mkdir -p TMessagesProj/jni/tde2e/$arch
                 cp /prebuilt/tde2e/$arch/*.a TMessagesProj/jni/tde2e/$arch/
               fi
             done
+            echo "Verifying: $(ls TMessagesProj/jni/boringssl/build/arm64-v8a/crypto/libcrypto.a 2>&1)"
           fi
 
           ./gradlew :TMessagesProj_App:${{ matrix.afat }}

TMessagesProj/build.gradle

@@ -250,12 +250,17 @@ def getProps(String propName) {
 
 task buildNativeDeps(description: 'Build native dependencies.') {
     doFirst {
-        exec {
-            def ndkDir = android.ndkDirectory
-            println "NDK Directory: ${ndkDir}"
-            println "Working Directory: ${projectDir}/jni"
-            workingDir "${projectDir}/jni"
-            commandLine 'python3', 'prepare.py', 'silent', 'ndk=' + ndkDir, 'arm', 'arm64'
+        def boringsslLib = file("${projectDir}/jni/boringssl/build/arm64-v8a/crypto/libcrypto.a")
+        if (boringsslLib.exists()) {
+            println "Phase 1 native artifacts already present, skipping prepare.py"
+        } else {
+            exec {
+                def ndkDir = android.ndkDirectory
+                println "NDK Directory: ${ndkDir}"
+                println "Working Directory: ${projectDir}/jni"
+                workingDir "${projectDir}/jni"
+                commandLine 'python3', 'prepare.py', 'silent', 'ndk=' + ndkDir, 'arm', 'arm64'
+            }
         }
     }
 }

docker/Dockerfile

@@ -114,6 +114,9 @@ RUN mkdir -p /prebuilt && \
       if [ -d "/build/jni/$lib/build" ]; then \
         mkdir -p /prebuilt/$lib && cp -r /build/jni/$lib/build /prebuilt/$lib/; \
       fi; \
+      if [ -d "/build/jni/$lib/include" ]; then \
+        cp -r /build/jni/$lib/include /prebuilt/$lib/; \
+      fi; \
     done && \
     for arch in arm64-v8a armeabi-v7a; do \
       if [ -d "/build/jni/tde2e/$arch" ]; then \