Update default OpenSSL versions in examples.
This commit is contained in:
parent
eb664b4e9f
commit
9692ecf25b
@ -8,7 +8,7 @@ ARG ANDROID_NDK_VERSION=23.2.8568313
|
||||
COPY ./check-environment.sh ./fetch-sdk.sh ./
|
||||
RUN ./fetch-sdk.sh SDK "$ANDROID_NDK_VERSION"
|
||||
|
||||
ARG OPENSSL_VERSION=OpenSSL_1_1_1q
|
||||
ARG OPENSSL_VERSION=OpenSSL_1_1_1t
|
||||
COPY ./build-openssl.sh ./
|
||||
RUN ./build-openssl.sh SDK "$ANDROID_NDK_VERSION" openssl "$OPENSSL_VERSION"
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
ANDROID_SDK_ROOT=${1:-SDK}
|
||||
ANDROID_NDK_VERSION=${2:-23.2.8568313}
|
||||
OPENSSL_INSTALL_DIR=${3:-third-party/openssl}
|
||||
OPENSSL_VERSION=${4:-OpenSSL_1_1_1q} # openssl-3.0.5
|
||||
OPENSSL_VERSION=${4:-OpenSSL_1_1_1t} # openssl-3.1.0
|
||||
|
||||
if [ ! -d "$ANDROID_SDK_ROOT" ] ; then
|
||||
echo "Error: directory \"$ANDROID_SDK_ROOT\" doesn't exist. Run ./fetch-sdk.sh first, or provide a valid path to Android SDK."
|
||||
|
@ -3,7 +3,7 @@ cd $(dirname $0)
|
||||
|
||||
emconfigure true 2> /dev/null || { echo 'emconfigure not found. Install emsdk and add emconfigure and emmake to PATH environment variable. See instruction at https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html. Do not forget to add `emconfigure` and `emmake` to the PATH environment variable via `emsdk/emsdk_env.sh` script.'; exit 1; }
|
||||
|
||||
OPENSSL=OpenSSL_1_1_0j
|
||||
OPENSSL=OpenSSL_1_1_0l
|
||||
if [ ! -f $OPENSSL.tar.gz ]; then
|
||||
echo "Downloading OpenSSL sources..."
|
||||
wget https://github.com/openssl/openssl/archive/$OPENSSL.tar.gz
|
||||
|
@ -22,7 +22,7 @@ OPENSSL_OPTIONS="-DOPENSSL_FOUND=1 \
|
||||
-DOPENSSL_CRYPTO_LIBRARY=\"$OPENSSL_CRYPTO_LIBRARY\" \
|
||||
-DOPENSSL_SSL_LIBRARY=\"$OPENSSL_SSL_LIBRARY\" \
|
||||
-DOPENSSL_LIBRARIES=\"$OPENSSL_SSL_LIBRARY;$OPENSSL_CRYPTO_LIBRARY\" \
|
||||
-DOPENSSL_VERSION=\"1.1.0j\""
|
||||
-DOPENSSL_VERSION=\"1.1.0l\""
|
||||
|
||||
cd build/generate
|
||||
cmake $TD_ROOT || exit 1
|
||||
|
Loading…
Reference in New Issue
Block a user