Merge pull request zingolabs#789 from juanky201271/dev_openssl_ndk_upgrade

Openssl & ndk upgraded

Author: dorianvp

.github/workflows/android-build.yaml

@@ -62,7 +62,7 @@ jobs:
     if: ${{ needs.android-check-build-cache.outputs.native-cache-found != 'true' || needs.android-check-build-cache.outputs.kotlin-cache-found != 'true' }}
     runs-on: ubuntu-22.04
     container:
-      image: zingodevops/android_builder:012
+      image: zingodevops/android_builder:013
     env:
       RUSTUP_HOME: /root/.rustup
     steps:
@@ -150,7 +150,7 @@ jobs:
           LD: ld
           RANLIB: llvm-ranlib
           CC: ${{ env.CC }}24-clang
-          OPENSSL_DIR: /opt/openssl-3.3.1/${{ env.OPENSSL_PATH }}
+          OPENSSL_DIR: /opt/openssl-3.4.1/${{ env.OPENSSL_PATH }}
           CARGO_FEATURE_STD: true
 
       - name: LLVM Strip

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         minSdkVersion = 24
         compileSdkVersion = 35
         targetSdkVersion = 34
-        ndkVersion = "27.1.12297006"
+        ndkVersion = "27.2.12479018"
         kotlinVersion = "2.0.21"
     }
     repositories {

rust/Dockerfile

@@ -1,4 +1,4 @@
-FROM zingodevops/android_builder:012 as build_android
+FROM zingodevops/android_builder:013 as build_android
 
 WORKDIR /opt/zingo/rust/lib/
 
@@ -21,27 +21,27 @@ RUN cargo run --release --features=uniffi/cli --bin uniffi-bindgen \
 RUN cargo install --version ^3 cargo-ndk
 
 #RUN AR=llvm-ar LD=ld RANLIB=llvm-ranlib CC=aarch64-linux-android24-clang \
-#    OPENSSL_DIR=/opt/openssl-3.3.1/aarch64 cargo +nightly build -Z build-std \
+#    OPENSSL_DIR=/opt/openssl-3.4.1/aarch64 cargo +nightly build -Z build-std \
 #    --target aarch64-linux-android --release
 # this is for indexmap 1.9.3 -> forcing `features = ["std"]`
 ENV CARGO_FEATURE_STD=true
-RUN OPENSSL_DIR=/opt/openssl-3.3.1/aarch64 cargo ndk --target arm64-v8a build --release -Z build-std
+RUN OPENSSL_DIR=/opt/openssl-3.4.1/aarch64 cargo ndk --target arm64-v8a build --release -Z build-std
 RUN llvm-strip ../target/aarch64-linux-android/release/libzingo.so
 
 #RUN AR=llvm-ar LD=ld RANLIB=llvm-ranlib CC=x86_64-linux-android24-clang \
-#    OPENSSL_DIR=/opt/openssl-3.3.1/x86_64 cargo +nightly build -Z build-std \
+#    OPENSSL_DIR=/opt/openssl-3.4.1/x86_64 cargo +nightly build -Z build-std \
 #    --target x86_64-linux-android --release
-RUN OPENSSL_DIR=/opt/openssl-3.3.1/x86_64 cargo ndk --target x86_64 build --release -Z build-std
+RUN OPENSSL_DIR=/opt/openssl-3.4.1/x86_64 cargo ndk --target x86_64 build --release -Z build-std
 RUN llvm-strip ../target/x86_64-linux-android/release/libzingo.so
 
 #RUN AR=llvm-ar LD=ld RANLIB=llvm-ranlib CC=armv7a-linux-androideabi24-clang \
-#    OPENSSL_DIR=/opt/openssl-3.3.1/armv7 cargo +nightly build -Z build-std \
+#    OPENSSL_DIR=/opt/openssl-3.4.1/armv7 cargo +nightly build -Z build-std \
 #    --target armv7-linux-androideabi --release
-RUN OPENSSL_DIR=/opt/openssl-3.3.1/armv7 cargo ndk --target armeabi-v7a build --release -Z build-std
+RUN OPENSSL_DIR=/opt/openssl-3.4.1/armv7 cargo ndk --target armeabi-v7a build --release -Z build-std
 RUN llvm-strip ../target/armv7-linux-androideabi/release/libzingo.so
 
 #RUN AR=llvm-ar LD=ld RANLIB=llvm-ranlib CC=i686-linux-android24-clang \
-#    OPENSSL_DIR=/opt/openssl-3.3.1/x86 cargo +nightly build -Z build-std \
+#    OPENSSL_DIR=/opt/openssl-3.4.1/x86 cargo +nightly build -Z build-std \
 #    --target i686-linux-android --release
-RUN OPENSSL_DIR=/opt/openssl-3.3.1/x86 cargo ndk --target x86 build --release -Z build-std
+RUN OPENSSL_DIR=/opt/openssl-3.4.1/x86 cargo ndk --target x86 build --release -Z build-std
 RUN llvm-strip ../target/i686-linux-android/release/libzingo.so

rust/android/builder/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:latest
-ARG android_ndk_ver=r27b
-# 27.1.12297006
+ARG android_ndk_ver=r27c
+# 27.2.12479018
 
 # Install dependencies
 RUN apt update \
@@ -71,41 +71,41 @@ RUN echo "[target.x86_64-linux-android]" >> $CARGO_HOME/config.toml \
 
 # Install and setup OpenSSL
 WORKDIR /opt
-RUN curl -LO https://www.openssl.org/source/openssl-3.3.1.tar.gz -o openssl-3.3.1.tar.gz \
-    && tar xvf openssl-3.3.1.tar.gz \
-    && rm -rf openssl-3.3.1.tar.gz
+RUN curl -LO https://www.openssl.org/source/openssl-3.4.1.tar.gz -o openssl-3.4.1.tar.gz \
+    && tar xvf openssl-3.4.1.tar.gz \
+    && rm -rf openssl-3.4.1.tar.gz
 ENV OPENSSL_STATIC=yes
-WORKDIR /opt/openssl-3.3.1 
+WORKDIR /opt/openssl-3.4.1 
 RUN mkdir x86 \
     && mkdir aarch64 \
     && mkdir armv7 \
     && mkdir x86_64
 
-RUN ./Configure --prefix=/opt/openssl-3.3.1/aarch64 android-arm64 \
+RUN ./Configure --prefix=/opt/openssl-3.4.1/aarch64 android-arm64 \
     -mno-outline-atomics \
     -U__ANDROID_API__ \
     -D__ANDROID_API__=24 \
     && make -j$(nproc) \
     && make -j$(nproc) install \
     && make clean \
     && make distclean
-RUN ./Configure --prefix=/opt/openssl-3.3.1/armv7 android-arm \
+RUN ./Configure --prefix=/opt/openssl-3.4.1/armv7 android-arm \
     -U__ANDROID_API__ \
     -D__ANDROID_API__=24 \
     && make -j$(nproc) \
     && make -j$(nproc) install \
     && make clean \
     && make distclean
-RUN ./Configure --prefix=/opt/openssl-3.3.1/x86 android-x86 \
+# openssl-3.4.1 -> remove: -DBROKEN_CLANG_ATOMICS \
+RUN ./Configure --prefix=/opt/openssl-3.4.1/x86 android-x86 \
     -latomic \
-    -DBROKEN_CLANG_ATOMICS \
     -U__ANDROID_API__ \
     -D__ANDROID_API__=24 \
     && make -j$(nproc) \
     && make -j$(nproc) install \
     && make clean \
     && make distclean
-RUN ./Configure --prefix=/opt/openssl-3.3.1/x86_64 android-x86_64 \
+RUN ./Configure --prefix=/opt/openssl-3.4.1/x86_64 android-x86_64 \
     -U__ANDROID_API__ \
     -D__ANDROID_API__=24 \
     && make -j$(nproc) \