Merge branch 'develop' into main-backup

Author: Ginder-Singh

.gitlab-ci.yml

@@ -180,6 +180,13 @@ BuildStrongswan:
     - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
     - export PATH=$JAVA_HOME/bin:$PATH
 
+    # Install Gradle
+    - GRADLE_VERSION=8.7
+    - wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip
+    - unzip gradle-${GRADLE_VERSION}-bin.zip -d /opt/gradle
+    - export PATH="/opt/gradle/gradle-${GRADLE_VERSION}/bin:$PATH"
+    - gradle --version
+
     # Create Android SDK dir
     - mkdir -p /opt/android-sdk/cmdline-tools
     - cd /opt/android-sdk
@@ -209,34 +216,13 @@ BuildStrongswan:
     - export OPENSSL_SRC="$PWD/openssl-OpenSSL_1_1_1t"
 
   script:
-    - cd $CI_PROJECT_DIR
+    - cd "$CI_PROJECT_DIR"
     - rm -rf strongswan-src
-    - git clone --branch $SS_BRANCH $SS_REMOTE strongswan-src
-    # Build Openssl static lib.
-    - cp -a "$OPENSSL_SRC/." "$CI_PROJECT_DIR/strongswan-src/src/frontends/android/openssl/"
-    - export OUT_DIR="$PWD/strongswan-src/src/frontends/android/app/src/main/jni/openssl"
-    - cd $CI_PROJECT_DIR/strongswan-src/src/frontends/android/openssl
-    - ./compile.sh
-    - echo "LOCAL_PATH := \$(call my-dir)" >"${OUT_DIR}/Android.mk"
-    - echo "include \$(CLEAR_VARS)" >>"${OUT_DIR}/Android.mk"
-    - echo "LOCAL_MODULE := libcrypto_static" >>"${OUT_DIR}/Android.mk"
-    - echo "LOCAL_SRC_FILES := \$(TARGET_ARCH_ABI)/libcrypto.a" >>"${OUT_DIR}/Android.mk"
-    - echo "LOCAL_EXPORT_C_INCLUDES := \$(LOCAL_PATH)/include" >>"${OUT_DIR}/Android.mk"
-    - echo "include \$(PREBUILT_STATIC_LIBRARY)" >>"${OUT_DIR}/Android.mk"
-    # Build Strongswan.
-    - cd $CI_PROJECT_DIR/strongswan-src
-    - ./autogen.sh > config.log
-    - ./configure --disable-defaults > config.log
-    - make dist -j $(nproc) > config.log
-    - rm config.log
-    # Build App.
-    - cd $CI_PROJECT_DIR
-    - cd strongswan-src/src/frontends/android
-    - sed -i '/arguments '\''-j'\'' \+ Runtime\.runtime\.availableProcessors()/a\        arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"' app/build.gradle
-    - ./gradlew assembleRelease
-    # Copy binaries for download
-    - mkdir -p $CI_PROJECT_DIR/artifacts
-    - zip -r $CI_PROJECT_DIR/artifacts/strongswan-libs.zip app/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib
+    - git clone --branch "$SS_BRANCH" "$SS_REMOTE" strongswan-src
+    - chmod +x ./tools/build_strongswan.sh
+    - ./tools/build_strongswan.sh "$CI_PROJECT_DIR/strongswan-src" "$OPENSSL_SRC" "$CI_PROJECT_DIR/artifacts"
+    - cd "$CI_PROJECT_DIR/artifacts"
+    - zip -r strongswan-libs.zip .
   artifacts:
     paths:
       - $CI_PROJECT_DIR/artifacts/strongswan-libs.zip

tools/build_strongswan.sh

@@ -1,42 +1,60 @@
-strongswanLibsSrc="$PWD/../strongswan-src/src/frontends/android/app/src/main/libs/*"
-strongswanLibsDst="$PWD/../strongswan/libs"
-mkdir -p $strongswanLibsDst
-strongswanRoot="$PWD/../strongswan-src"
-cd $strongswanRoot
-lib="$PWD/src/frontends/android/app/src/main/jni/openssl"
-PATH=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
-pushd $OpenSSL
-CC=armv7a-linux-androideabi16-clang ./Configure android-arm no-shared no-ssl3 no-engine no-dso no-asm no-hw no-comp no-stdio -fPIC -DOPENSSL_PIC -D__ANDROID_API__=16 -ffast-math -O3 -funroll-loops
-make -j $(nproc) > config.log
-mkdir -p "${lib}/armeabi-v7a"
-cp libcrypto.a ${lib}/armeabi-v7a/
-make distclean
-CC=aarch64-linux-android21-clang ./Configure android-arm64 no-shared no-ssl3 no-engine no-dso no-asm no-hw no-comp no-stdio -fPIC -DOPENSSL_PIC -D__ANDROID_API__=21 -ffast-math -O3 -funroll-loops
-make -j $(nproc) > config.log
-mkdir -p "${lib}/arm64-v8a"
-cp libcrypto.a ${lib}/arm64-v8a/
-make distclean
-CC=i686-linux-android16-clang ./Configure android-x86 no-shared no-ssl3 no-engine no-dso no-asm no-hw no-comp no-stdio -fPIC -DOPENSSL_PIC -D__ANDROID_API__=16 -ffast-math -O3 -funroll-loops
-make -j $(nproc) > config.log
-mkdir -p "${lib}/x86"
-cp libcrypto.a ${lib}/x86/
-make distclean
-CC=x86_64-linux-android21-clang ./Configure android-x86_64 no-shared no-ssl3 no-engine no-dso no-asm no-hw no-comp no-stdio -fPIC -DOPENSSL_PIC -D__ANDROID_API__=21 -ffast-math -O3 -funroll-loops
-make -j $(nproc) > config.log
-mkdir -p "${lib}/x86_64"
-cp libcrypto.a ${lib}/x86_64/
-cp -R include/ ${lib}/
-make distclean
-rm config.log
-popd
-echo "LOCAL_PATH := \$(call my-dir)" >"${lib}/Android.mk"
-echo "include \$(CLEAR_VARS)" >>"${lib}/Android.mk"
-echo "LOCAL_MODULE := libcrypto_static" >>"${lib}/Android.mk"
-echo "LOCAL_SRC_FILES := \$(TARGET_ARCH_ABI)/libcrypto.a" >>"${lib}/Android.mk"
-echo "LOCAL_EXPORT_C_INCLUDES := \$(LOCAL_PATH)/include" >>"${lib}/Android.mk"
-echo "include \$(PREBUILT_STATIC_LIBRARY)" >>"${lib}/Android.mk"
-cd $strongswanRoot
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# === Usage ===
+# ./build_strongswan.sh /path/to/strongswan-src /path/to/openssl /path/to/output-libs
+# ================================
+
+if [ "$#" -ne 3 ]; then
+    echo "Usage: $0 <strongswan-dir> <openssl-dir> <strongswan-libs-dst>"
+    exit 1
+fi
+
+# === Parameters ===
+STRONGSWAN_DIR="$1"
+OPENSSL_SRC="$2"
+STRONGSWAN_LIBS_DST="$3"
+
+# === Derived Paths ===
+ANDROID_OPENSSL_DIR="$STRONGSWAN_DIR/src/frontends/android/openssl"
+export OUT_DIR="$STRONGSWAN_DIR/src/frontends/android/app/src/main/jni/openssl"
+APP_DIR="$STRONGSWAN_DIR/src/frontends/android/app"
+
+echo "===> Copying OpenSSL sources..."
+cp -a "$OPENSSL_SRC/." "$ANDROID_OPENSSL_DIR/"
+
+echo "===> Compiling OpenSSL..."
+cd "$ANDROID_OPENSSL_DIR"
+./compile.sh
+
+echo "===> Generating Android.mk for libcrypto_static..."
+mkdir -p "$OUT_DIR"
+cat <<EOF > "${OUT_DIR}/Android.mk"
+LOCAL_PATH := \$(call my-dir)
+include \$(CLEAR_VARS)
+LOCAL_MODULE := libcrypto_static
+LOCAL_SRC_FILES := \$(TARGET_ARCH_ABI)/libcrypto.a
+LOCAL_EXPORT_C_INCLUDES := \$(LOCAL_PATH)/include
+include \$(PREBUILT_STATIC_LIBRARY)
+EOF
+
+echo "===> Building Strongswan..."
+cd "$STRONGSWAN_DIR"
 ./autogen.sh > config.log
-./configure --disable-defaults > config.log
-make dist -j $(nproc) > config.log
+./configure --disable-defaults >> config.log
+make dist -j "$(nproc)" >> config.log
 rm config.log
+
+echo "===> Updating Gradle build config..."
+cd "$APP_DIR"
+sed -i '/arguments '\''-j'\'' \+ Runtime\.runtime\.availableProcessors()/a\        arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"' build.gradle
+
+echo "===> Building release APK..."
+gradle assembleRelease
+
+echo "===> Copying output libs to: $STRONGSWAN_LIBS_DST"
+mkdir -p "$STRONGSWAN_LIBS_DST"
+cp -r "$APP_DIR"/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/* "$STRONGSWAN_LIBS_DST/"
+
+echo "✅ Build completed successfully."