Update OpenSSL version in examples.
This commit is contained in:
parent
371ddde1f5
commit
4d9baf6fc0
@ -8,7 +8,7 @@ ARG ANDROID_NDK_VERSION=23.2.8568313
|
|||||||
COPY ./check-environment.sh ./fetch-sdk.sh ./
|
COPY ./check-environment.sh ./fetch-sdk.sh ./
|
||||||
RUN ./fetch-sdk.sh SDK "$ANDROID_NDK_VERSION"
|
RUN ./fetch-sdk.sh SDK "$ANDROID_NDK_VERSION"
|
||||||
|
|
||||||
ARG OPENSSL_VERSION=OpenSSL_1_1_1t
|
ARG OPENSSL_VERSION=OpenSSL_1_1_1w
|
||||||
COPY ./build-openssl.sh ./
|
COPY ./build-openssl.sh ./
|
||||||
RUN ./build-openssl.sh SDK "$ANDROID_NDK_VERSION" openssl "$OPENSSL_VERSION"
|
RUN ./build-openssl.sh SDK "$ANDROID_NDK_VERSION" openssl "$OPENSSL_VERSION"
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
ANDROID_SDK_ROOT=${1:-SDK}
|
ANDROID_SDK_ROOT=${1:-SDK}
|
||||||
ANDROID_NDK_VERSION=${2:-23.2.8568313}
|
ANDROID_NDK_VERSION=${2:-23.2.8568313}
|
||||||
OPENSSL_INSTALL_DIR=${3:-third-party/openssl}
|
OPENSSL_INSTALL_DIR=${3:-third-party/openssl}
|
||||||
OPENSSL_VERSION=${4:-OpenSSL_1_1_1t} # openssl-3.1.0
|
OPENSSL_VERSION=${4:-OpenSSL_1_1_1w} # openssl-3.3.0
|
||||||
|
|
||||||
if [ ! -d "$ANDROID_SDK_ROOT" ] ; then
|
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."
|
echo "Error: directory \"$ANDROID_SDK_ROOT\" doesn't exist. Run ./fetch-sdk.sh first, or provide a valid path to Android SDK."
|
||||||
|
@ -21,7 +21,7 @@ index a1d13e9..8efcf20 100644
|
|||||||
# probably some other packages as well) only works with 1.1.1, so
|
# probably some other packages as well) only works with 1.1.1, so
|
||||||
# we need to preserve the ability to build the older OpenSSL (for now...)
|
# we need to preserve the ability to build the older OpenSSL (for now...)
|
||||||
-OPENSSL_VERSION=3.1.0
|
-OPENSSL_VERSION=3.1.0
|
||||||
+OPENSSL_VERSION=3.1.2
|
+OPENSSL_VERSION=3.1.5
|
||||||
# OPENSSL_VERSION_NUMBER=1.1.1
|
# OPENSSL_VERSION_NUMBER=1.1.1
|
||||||
# OPENSSL_REVISION=q
|
# OPENSSL_REVISION=q
|
||||||
# OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
|
# OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
|
||||||
|
Loading…
Reference in New Issue
Block a user