From 86d36a4e7d11ebbc7cca0781b5af26f7d76286db Mon Sep 17 00:00:00 2001
From: Cloud0310 <60375730+Cloud0310@users.noreply.github.com>
Date: Tue, 11 Aug 2026 22:00:12 +0800
Subject: [PATCH 1/3] Revert "ci(docker/android): stop building OpenSSL"

This reverts commit 300c1b4406d8c0a35d3b4a2a1184ca7cf6940b63.
---
 ci/run.bash | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/ci/run.bash b/ci/run.bash
index 0a7d742e68..3c140c44b9 100644
--- a/ci/run.bash
+++ b/ci/run.bash
@@ -19,16 +19,10 @@ if [ -n "$INSTALL_BINDGEN" ]; then
   export PATH="$CARGO_HOME/bin/bindgen-cli:$PATH"
 fi
 
-FEATURES=('--no-default-features')
-case "$TARGET" in
-  *-linux-android*) ;;
-  *)
-    FEATURES+=('--features' 'reqwest-native-tls')
-    case "$(uname -s)" in
-      *NT* ) ;; # Windows NT
-      * ) FEATURES+=('--features' 'vendored-openssl') ;;
-    esac
-    ;;
+FEATURES=('--no-default-features' '--features' 'reqwest-native-tls')
+case "$(uname -s)" in
+  *NT* ) ;; # Windows NT
+  * ) FEATURES+=('--features' 'vendored-openssl') ;;
 esac
 
 case "$TARGET" in

From e341eb64a14b7246f279edae00d7e14a5e6eac44 Mon Sep 17 00:00:00 2001
From: Cloud0310 <60375730+Cloud0310@users.noreply.github.com>
Date: Tue, 11 Aug 2026 21:08:14 +0800
Subject: [PATCH 2/3] feat(openssl): strip unnessary openssl flags

This fixes previouse android ci/cd error, and further strips some of the
openssl parts to improve build speed and size.
---
 ci/openssl-configure.sh | 6 ++++++
 ci/run.bash             | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 ci/openssl-configure.sh

diff --git a/ci/openssl-configure.sh b/ci/openssl-configure.sh
new file mode 100755
index 0000000000..309119e833
--- /dev/null
+++ b/ci/openssl-configure.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+configure=$1
+shift
+# `openssl-src` has no API for extra Configure arguments.
+exec perl "$configure" no-dtls no-sm2 no-sm3 no-sm4 no-srtp "$@"
diff --git a/ci/run.bash b/ci/run.bash
index 3c140c44b9..395a3f6cf2 100644
--- a/ci/run.bash
+++ b/ci/run.bash
@@ -22,7 +22,7 @@ fi
 FEATURES=('--no-default-features' '--features' 'reqwest-native-tls')
 case "$(uname -s)" in
   *NT* ) ;; # Windows NT
-  * ) FEATURES+=('--features' 'vendored-openssl') ;;
+  * ) FEATURES+=('--features' 'vendored-openssl'); export OPENSSL_SRC_PERL="$PWD/ci/openssl-configure.sh" ;;
 esac
 
 case "$TARGET" in

From 0d48290a95c2121f7c889e045831ea40fe2dd8b7 Mon Sep 17 00:00:00 2001
From: Cloud0310 <60375730+Cloud0310@users.noreply.github.com>
Date: Tue, 11 Aug 2026 22:00:57 +0800
Subject: [PATCH 3/3] ci: temporarily enable x86_64-linux-android on PRs

---
 .github/workflows/ci.yaml                       | 3 ++-
 ci/actions-templates/linux-builds-template.yaml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f57ca6d789..b3ba06ef8d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -641,6 +641,7 @@ jobs:
           - armv7-unknown-linux-gnueabihf
           - aarch64-linux-android
           - aarch64-unknown-linux-gnu
+          - x86_64-linux-android           # skip-main
         include:
           - target: x86_64-unknown-linux-gnu
             run_tests: YES
@@ -1001,7 +1002,7 @@ jobs:
           - sparcv9-sun-solaris            # skip-pr skip-main
           - arm-linux-androideabi          # skip-pr skip-main
           - armv7-linux-androideabi        # skip-pr skip-main
-          - x86_64-linux-android           # skip-pr skip-main
+          - x86_64-linux-android           # skip-main
           - riscv64gc-unknown-linux-gnu    # skip-pr skip-main
           - riscv64gc-unknown-linux-musl   # skip-pr skip-main
           - loongarch64-unknown-linux-gnu  # skip-pr skip-main
diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
index cf6730e66a..7e310f975c 100644
--- a/ci/actions-templates/linux-builds-template.yaml
+++ b/ci/actions-templates/linux-builds-template.yaml
@@ -42,7 +42,7 @@ jobs: # skip-main skip-pr skip-stable
           - sparcv9-sun-solaris            # skip-pr skip-main
           - arm-linux-androideabi          # skip-pr skip-main
           - armv7-linux-androideabi        # skip-pr skip-main
-          - x86_64-linux-android           # skip-pr skip-main
+          - x86_64-linux-android           # skip-main
           - riscv64gc-unknown-linux-gnu    # skip-pr skip-main
           - riscv64gc-unknown-linux-musl   # skip-pr skip-main
           - loongarch64-unknown-linux-gnu  # skip-pr skip-main