scripts/properties.sh: set java home to openjdk 8

Fix packages like termux-am
This commit is contained in:
Leonid Pliushch 2021-08-01 18:38:19 +03:00
parent 45557e36a7
commit 58397fde9a
No known key found for this signature in database
GPG Key ID: 45F2964132545795
3 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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