diff --git a/packages/openjdk-17/build.sh b/packages/openjdk-17/build.sh index 14aa0a179..5588d61a3 100644 --- a/packages/openjdk-17/build.sh +++ b/packages/openjdk-17/build.sh @@ -13,6 +13,8 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HAS_DEBUG=false termux_step_pre_configure() { + unset JAVA_HOME + # Provide fake gcc. mkdir -p $TERMUX_PKG_SRCDIR/wrappers-bin cat <<- EOF > $TERMUX_PKG_SRCDIR/wrappers-bin/android-wrapped-clang diff --git a/scripts/properties.sh b/scripts/properties.sh index 248d14304..01e321170 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -3,6 +3,8 @@ TERMUX_NDK_VERSION_NUM=21 TERMUX_NDK_REVISION="d" TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then export ANDROID_HOME=${TERMUX_SCRIPTDIR}/build-tools/android-sdk export NDK=${TERMUX_SCRIPTDIR}/build-tools/android-ndk diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index fea594aec..dce0085ef 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -4,8 +4,6 @@ set -e -u # Install desired parts of the Android SDK: . $(cd "$(dirname "$0")"; pwd)/properties.sh -export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 - ANDROID_SDK_FILE=sdk-tools-linux-4333796.zip ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-Linux-x86_64.zip