From c24ed30d5b764d41d8bc202b7990b7cb990db3a0 Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 11 Aug 2022 20:38:10 +0300 Subject: [PATCH] Use the current directory as classpath for javadoc. Multiple classpath directory support seems to be broken in newer javadoc. --- example/android/build-tdlib.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/example/android/build-tdlib.sh b/example/android/build-tdlib.sh index f4e94f735..c4c7ea357 100755 --- a/example/android/build-tdlib.sh +++ b/example/android/build-tdlib.sh @@ -7,12 +7,7 @@ ANDROID_NDK_VERSION=${2:-23.2.8568313} source ./check-environment.sh || exit 1 echo "Downloading annotation Java package..." -rm -rf annotation || exit 1 -mkdir -p annotation || exit 1 -cd annotation -$WGET https://maven.google.com/androidx/annotation/annotation/1.4.0/annotation-1.4.0.pom || exit 1 $WGET https://maven.google.com/androidx/annotation/annotation/1.4.0/annotation-1.4.0.jar || exit 1 -cd .. echo "Generating TDLib source files..." mkdir -p build-native || exit 1 @@ -33,8 +28,9 @@ rm -rf org || 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 +cp "$ANDROID_SDK_ROOT/platforms/android-33/android.jar" . || exit 1 +javadoc -d tdlib/javadoc -encoding UTF-8 -charset UTF-8 -classpath "*" -sourcepath tdlib/java org.drinkless.tdlib || exit 1 +rm android.jar annotation-1.4.0.jar || exit 1 echo "Building TDLib..." for ABI in arm64-v8a armeabi-v7a x86_64 x86 ; do