zapstore-mirror/org.parres.whitenoise
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add OpenSSL vars to build android script (#228)

Browse Source
This commit is contained in:
emir yorulmaz
2026-02-12 00:33:25 +03:00
committed by GitHub
parent a62f05e90e
commit ca65ca7b2f
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build_android.sh
+15
View File
@@ -89,6 +89,21 @@ export CC_armv7_linux_androideabi="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$H
export CXX_armv7_linux_androideabi="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$HOST_TAG/bin/armv7a-linux-androideabi33-clang++"
export AR_armv7_linux_androideabi="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$HOST_TAG/bin/llvm-ar"
# OpenSSL environment variables for Android cross-compilation
# Point to macOS OpenSSL for the build process (sqlcipher needs headers)
if [ -d "/opt/homebrew/opt/openssl@3" ]; then
export OPENSSL_DIR="/opt/homebrew/opt/openssl@3"
export OPENSSL_INCLUDE_DIR="/opt/homebrew/opt/openssl@3/include"
export OPENSSL_LIB_DIR="/opt/homebrew/opt/openssl@3/lib"
elif [ -d "/usr/local/opt/openssl@3" ]; then
export OPENSSL_DIR="/usr/local/opt/openssl@3"
export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl@3/include"
export OPENSSL_LIB_DIR="/usr/local/opt/openssl@3/lib"
fi
# Use vendored OpenSSL for cross-compilation to avoid linking issues
export OPENSSL_STATIC=1
# Check if required tools are installed
print_step "Checking development environment"
if ! command -v rustup &> /dev/null; then
scripts/setup_android_config.sh
+8 -5
View File
@@ -53,11 +53,6 @@ linker = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/aarch64-l
ar = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/llvm-ar"
linker = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/armv7a-linux-androideabi33-clang"
[env]
CC_armv7_linux_androideabi = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/armv7a-linux-androideabi33-clang"
CXX_armv7_linux_androideabi = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/armv7a-linux-androideabi33-clang++"
AR_armv7_linux_androideabi = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/llvm-ar"
[target.i686-linux-android]
ar = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/llvm-ar"
linker = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/i686-linux-android33-clang"
@@ -65,6 +60,14 @@ linker = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/i686-linu
[target.x86_64-linux-android]
ar = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/llvm-ar"
linker = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/x86_64-linux-android33-clang"
[env]
CC_armv7_linux_androideabi = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/armv7a-linux-androideabi33-clang"
CXX_armv7_linux_androideabi = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/armv7a-linux-androideabi33-clang++"
AR_armv7_linux_androideabi = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/bin/llvm-ar"
OPENSSL_DIR = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/sysroot/usr"
OPENSSL_INCLUDE_DIR = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/sysroot/usr/include"
OPENSSL_LIB_DIR = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_TAG}/sysroot/usr/lib/aarch64-linux-android"
EOF
print_success "Generated Cargo config for host: $HOST_TAG"