tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check argument correctness in Android build scripts.

Browse Source
This commit is contained in:
levlam 2022-08-12 11:29:28 +03:00
parent de8c41a17b
commit 77a8cc6499
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
example/android/build-openssl.sh
View File

@ -5,9 +5,14 @@ ANDROID_SDK_ROOT=${1:-SDK}
ANDROID_NDK_VERSION=${2:-23.2.8568313}
OPENSSL=${3:-OpenSSL_1_1_1q} # openssl-3.0.5
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."
exit 1
fi
OPENSSL_INSTALL_DIR="third-party/openssl"
if [ -d "$OPENSSL_INSTALL_DIR" ] ; then
echo "Error: directory $OPENSSL_INSTALL_DIR already exists. Delete it manually to proceed."
echo "Error: directory \"$OPENSSL_INSTALL_DIR\" already exists. Delete it manually to proceed."
exit 1
fi

11
example/android/build-tdlib.sh
View File

@ -6,6 +6,17 @@ ANDROID_NDK_VERSION=${2:-23.2.8568313}
source ./check-environment.sh || exit 1
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."
exit 1
fi
OPENSSL_INSTALL_DIR="third-party/openssl"
if [ ! -d "$OPENSSL_INSTALL_DIR" ] ; then
echo "Error: directory \"$OPENSSL_INSTALL_DIR\" doesn't exists. Run ./build-openssl.sh first."
exit 1
fi
echo "Downloading annotation Java package..."
$WGET https://maven.google.com/androidx/annotation/annotation/1.4.0/annotation-1.4.0.jar || exit 1

2
example/android/fetch-sdk.sh
View File

@ -5,7 +5,7 @@ ANDROID_SDK_ROOT=${1:-SDK}
ANDROID_NDK_VERSION=${2:-23.2.8568313}
if [ -d "$ANDROID_SDK_ROOT" ] ; then
echo "Error: directory $ANDROID_SDK_ROOT already exists. Delete it manually to proceed."
echo "Error: directory \"$ANDROID_SDK_ROOT\" already exists. Delete it manually to proceed."
exit 1
fi