From eef6f6cfa0c0ad252556b3fbdbda75c0e4f6c149 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 11 Aug 2022 20:11:31 +0300
Subject: [PATCH] Fix javadoc usage.

---
 example/android/README.md        |  2 +-
 example/android/build-openssl.sh |  2 +-
 example/android/build-tdlib.sh   | 10 +++++-----
 example/android/fetch-sdk.sh     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/example/android/README.md b/example/android/README.md
index 20f9a63dd..709a80960 100644
--- a/example/android/README.md
+++ b/example/android/README.md
@@ -1,7 +1,7 @@
 # TDLib Android example
 
 This is an example of building `TDLib` for Android.
-You need a Bash shell on Linux, macOS, or Windows with some common tools, cmake, JDK, PHP, and gperf pre-installed.
+You need a Bash shell on Linux, macOS, or Windows with some common tools, a C++ compiler, cmake, JDK, PHP, and gperf pre-installed.
 
 ## Building TDLib for Android
 
diff --git a/example/android/build-openssl.sh b/example/android/build-openssl.sh
index 402fde934..42aa1a164 100755
--- a/example/android/build-openssl.sh
+++ b/example/android/build-openssl.sh
@@ -11,7 +11,7 @@ if [ -d "$OPENSSL_INSTALL_DIR" ] ; then
   exit 1
 fi
 
-source ./check-environment.sh
+source ./check-environment.sh || exit 1
 
 ANDROID_SDK_ROOT="$(cd "$(dirname -- "$ANDROID_SDK_ROOT")" >/dev/null; pwd -P)/$(basename -- "$ANDROID_SDK_ROOT")"
 
diff --git a/example/android/build-tdlib.sh b/example/android/build-tdlib.sh
index d96bf787b..f4e94f735 100755
--- a/example/android/build-tdlib.sh
+++ b/example/android/build-tdlib.sh
@@ -4,7 +4,7 @@ cd $(dirname $0)
 ANDROID_SDK_ROOT=${1:-SDK}
 ANDROID_NDK_VERSION=${2:-23.2.8568313}
 
-source ./check-environment.sh
+source ./check-environment.sh || exit 1
 
 echo "Downloading annotation Java package..."
 rm -rf annotation || exit 1
@@ -30,12 +30,12 @@ cp -p {../../example,tdlib}/java/org/drinkless/tdlib/Client.java || exit 1
 mv {,tdlib/java/}org/drinkless/tdlib/TdApi.java || exit 1
 rm -rf org || exit 1
 
-echo "Generating Javadoc documentation..."
-javadoc -d tdlib/javadoc -encoding UTF-8 -charset UTF-8 -bootclasspath $ANDROID_SDK_ROOT/platforms/android-33/android.jar -extdirs annotation -classpath tdlib/java org.drinkless.tdlib || exit 1
-rm -rf annotation || exit 1
-
 ANDROID_SDK_ROOT="$(cd "$(dirname -- "$ANDROID_SDK_ROOT")" >/dev/null; pwd -P)/$(basename -- "$ANDROID_SDK_ROOT")"
 
+echo "Generating Javadoc documentation..."
+javadoc -d tdlib/javadoc -encoding UTF-8 -charset UTF-8 -classpath "\"$ANDROID_SDK_ROOT/platforms/android-33/android.jar\";annotation/annotation-1.4.0.jar" -sourcepath tdlib/java org.drinkless.tdlib || exit 1
+rm -rf annotation || exit 1
+
 echo "Building TDLib..."
 for ABI in arm64-v8a armeabi-v7a x86_64 x86 ; do
   mkdir -p build-$ABI || exit 1
diff --git a/example/android/fetch-sdk.sh b/example/android/fetch-sdk.sh
index 863e76f9d..d014a20d4 100755
--- a/example/android/fetch-sdk.sh
+++ b/example/android/fetch-sdk.sh
@@ -9,7 +9,7 @@ if [ -d "$ANDROID_SDK_ROOT" ] ; then
   exit 1
 fi
 
-source ./check-environment.sh
+source ./check-environment.sh || exit 1
 
 SDKMANAGER="./sdkmanager"
 if [[ "$OS_NAME" == "win" ]] ; then