Dev: replace boringssl with openssl

Author: andriydruk

build-docker

@@ -83,4 +83,5 @@ $DOCKER run -i --rm \
             --build-compiler "${BUILD_COMPILER}" \
             --android-api "${ANDROID_API}" \
             --ndk-home "/usr/local/ndk/${ANDROID_NDK_VERSION}" \
+            --name "readdle-swift-${SWIFT_VERSION}_android" \
             --archs "${TARGET_ARCHS}"

scripts/build.sh

@@ -244,8 +244,6 @@ libxml2_version=$(versionFromTag ${swift_source_dir}/libxml2)
 curl_desc=$(describe ${swift_source_dir}/curl | tr '_' '.')
 curl_version=${curl_desc#curl-}
 
-boringssl_version=$(describe ${source_dir}/boringssl)
-
 function quiet_pushd {
     pushd "$1" >/dev/null 2>&1
 }
@@ -289,7 +287,7 @@ echo "Building from:"
 echo "  - Swift ${swift_version}"
 echo "  - libxml2 ${libxml2_version}"
 echo "  - curl ${curl_version}"
-echo "  - BoringSSL ${boringssl_version}"
+echo "  - OpenSSL 3.6.0"
 
 # make sure the products_dir is writeable
 ls -lad $products_dir
@@ -365,29 +363,42 @@ for arch in $archs; do
     quiet_popd
     groupend
 
-    groupstart "Building boringssl for ${compiler_target_host}"
-    quiet_pushd ${source_dir}/boringssl
-        run cmake \
-            -GNinja \
-            -B ${build_dir}/$arch/boringssl \
-            -DANDROID_ABI=$android_abi \
-            -DANDROID_PLATFORM=android-$android_api \
-            -DCMAKE_TOOLCHAIN_FILE=$ndk_home/build/cmake/android.toolchain.cmake \
-            -DCMAKE_BUILD_TYPE=$build_type \
-            -DCMAKE_INSTALL_PREFIX=$sdk_root/usr \
-            -DCMAKE_EXTRA_LINK_FLAGS="-Wl,-z,max-page-size=16384" \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DBUILD_STATIC_LIBS=ON \
-            -DBUILD_TESTING=OFF
-
-        quiet_pushd ${build_dir}/$arch/boringssl
-            run ninja -j$parallel_jobs
-        quiet_popd
-
-        header "Installing BoringSSL for $arch"
-        quiet_pushd ${build_dir}/$arch/boringssl
-            run ninja -j$parallel_jobs install
-        quiet_popd
+    groupstart "Building openssl for ${compiler_target_host}"
+    quiet_pushd ${source_dir}/openssl
+        (
+            # Isolated environment
+            export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"
+            export PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH"
+            export CFLAGS="-O3 -g -DNDEBUG -fpic -ffunction-sections -fdata-sections -fstack-protector-strong -funwind-tables -no-canonical-prefixes"
+
+            case $arch in
+                armv7)
+                    openssl_arch="android-arm"
+                    ;;
+                aarch64)
+                    openssl_arch="android-arm64"
+                    ;;
+                x86_64)
+                    openssl_arch="android-x86_64"
+                    ;;
+                x86)
+                    openssl_arch="android-x86"
+                    ;;
+                *)
+                    echo "Unknown architecture '$1'"
+                    usage
+                    exit 0
+                    ;;
+            esac
+
+            ./Configure $openssl_arch \
+                no-shared \
+                no-engine \
+                zlib \
+                --prefix="$sdk_root/usr"
+
+            make && make install_sw
+        )
     quiet_popd
     groupend
 
@@ -637,7 +648,7 @@ mkdir -p ${swift_res_root}
 
 cat > $swift_res_root/SDKSettings.json <<EOF
 {
-  "DisplayName": "Swift Android SDK",
+  "DisplayName": "Readdle Swift Android SDK",
   "Version": "${android_sdk_version}",
   "VersionMap": {},
   "CanonicalName": "linux-android"
@@ -792,6 +803,7 @@ EOF
       "sdkRootPath": "${ndk_sysroot}",
       "swiftResourcesPath": "${swift_res_root}/usr/lib/${SWIFT_RES_DIR}",
       "swiftStaticResourcesPath": "${swift_res_root}/usr/lib/${SWIFT_STATIC_RES_DIR}",
+      "includeSearchPaths": ["${swift_res_root}/usr/include"],
       "toolsetPaths": [ "swift-toolset.json" ]
 EOF
       #"librarySearchPaths": [ "${swift_res_root}/usr/lib/swift-x86_64/android/x86_64" ],

scripts/fetch-source.sh

@@ -154,10 +154,12 @@ fi
 popd >/dev/null
 groupend
 
-# Fetch BoringSSL
-groupstart "Fetching BoringSSL"
-[[ -d boringssl ]] || git clone https://boringssl.googlesource.com/boringssl
-pushd boringssl >/dev/null 2>&1
-git checkout ${BORINGSSL_VERSION}
-popd >/dev/null 2>&1
+# Fetch OpenSSL
+groupstart "Fetching OpenSSL"
+OPENSSL_VERSION=3.6.0
+DOWNLOAD_URL_OPENSSL=https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz
+wget $DOWNLOAD_URL_OPENSSL -O openssl.tar.gz
+mkdir -p openssl
+tar -xvf openssl.tar.gz -C openssl --strip-components=1
+rm -rf openssl.tar.gz
 groupend