From 9c615346c5e53e813cddefd955111c36db79293a Mon Sep 17 00:00:00 2001 From: gusadmin Date: Tue, 14 Jul 2026 18:42:28 +0300 Subject: [PATCH] =?UTF-8?q?Android:=20Java=2017=20=D0=B4=D0=BB=D1=8F=20Gra?= =?UTF-8?q?dle=20(7.6.4=20=D0=BD=D0=B5=20=D1=82=D1=8F=D0=BD=D0=B5=D1=82=20?= =?UTF-8?q?Java=2021)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit provision ставит openjdk-17, build-android.sh задаёт JAVA_HOME на java-17 перед flutter build apk (как RustDesk CI). Co-Authored-By: Claude Opus 4.8 --- scripts/build-android.sh | 5 ++++- scripts/provision-android.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/build-android.sh b/scripts/build-android.sh index fe9e74f..a4ef645 100644 --- a/scripts/build-android.sh +++ b/scripts/build-android.sh @@ -78,7 +78,10 @@ cp ./target/aarch64-linux-android/release/liblibrustdesk.so "$JNI/librustdesk.so cp "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so" "$JNI/" # --- APK --- -echo "[apk] flutter build apk --release --target-platform android-arm64 --split-per-abi ..." +# Gradle 7.6.4 не совместим с Java 21 (дефолт VM) -> используем Java 17 (как RustDesk CI). +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +export PATH="$JAVA_HOME/bin:$PATH" +echo "[apk] flutter build apk (JAVA_HOME=$JAVA_HOME) ..." ( cd flutter && flutter build apk --release --target-platform android-arm64 --split-per-abi ) # --- вынести артефакт --- diff --git a/scripts/provision-android.sh b/scripts/provision-android.sh index 6a9ce8a..3e9c946 100644 --- a/scripts/provision-android.sh +++ b/scripts/provision-android.sh @@ -19,7 +19,8 @@ echo "[apt] deps..." sudo apt-get update -qq sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \ clang libclang-dev cmake ninja-build nasm yasm pkg-config build-essential \ - libssl-dev curl git unzip xz-utils zip python3-pip >/dev/null # libssl-dev: host openssl-sys + libssl-dev openjdk-17-jdk-headless curl git unzip xz-utils zip python3-pip >/dev/null + # libssl-dev: host openssl-sys; openjdk-17: Gradle 7.6.4 не совместим с Java 21 # --- Rust + aarch64-android --- if [ ! -x "$HOME/.cargo/bin/rustc" ] && ! command -v rustc >/dev/null; then