sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts/properties.sh: put sdk and ndk in versioned folders

Browse Source 
To allow for having multiple sdk/ndk versions in ~/lib/.
This commit is contained in:
Henrik Grimler 2022-04-23 08:58:02 +02:00
parent 429881ad56
commit e3034c71fa
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/properties.sh
View File

@ -1,5 +1,6 @@
# keep repology-metadata in sync with this
TERMUX_SDK_REVISION=7583922
TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3
TERMUX_NDK_VERSION_NUM=23
TERMUX_NDK_REVISION="b"
@ -13,11 +14,11 @@ 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
export ANDROID_HOME=${TERMUX_SCRIPTDIR}/build-tools/android-sdk-$TERMUX_SDK_REVISION
export NDK=${TERMUX_SCRIPTDIR}/build-tools/android-ndk-r${TERMUX_NDK_VERSION}
else
: "${ANDROID_HOME:="${HOME}/lib/android-sdk"}"
: "${NDK:="${HOME}/lib/android-ndk"}"
: "${ANDROID_HOME:="${HOME}/lib/android-sdk-$TERMUX_SDK_REVISION"}"
: "${NDK:="${HOME}/lib/android-ndk-r${TERMUX_NDK_VERSION}"}"
fi
# Termux packages configuration.

10
scripts/setup-android-sdk.sh
View File

@ -8,8 +8,7 @@ set -e -u
. $(cd "$(dirname "$0")"; pwd)/properties.sh
. $(cd "$(dirname "$0")"; pwd)/build/termux_download.sh
ANDROID_SDK_REVISION=7583922
ANDROID_SDK_FILE=commandlinetools-linux-${ANDROID_SDK_REVISION}_latest.zip
ANDROID_SDK_FILE=commandlinetools-linux-${TERMUX_SDK_REVISION}_latest.zip
ANDROID_SDK_SHA256=124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip
ANDROID_NDK_SHA256=c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382
@ -21,10 +20,10 @@ if [ ! -d $ANDROID_HOME ]; then
# https://developer.android.com/studio/index.html#command-tools
echo "Downloading android sdk..."
termux_download https://dl.google.com/android/repository/${ANDROID_SDK_FILE} \
tools-$ANDROID_SDK_REVISION.zip \
tools-$TERMUX_SDK_REVISION.zip \
$ANDROID_SDK_SHA256
rm -Rf android-sdk
unzip -q tools-$ANDROID_SDK_REVISION.zip -d android-sdk
rm -Rf android-sdk-$TERMUX_SDK_REVISION
unzip -q tools-$TERMUX_SDK_REVISION.zip -d android-sdk-$TERMUX_SDK_REVISION
fi
if [ ! -d $NDK ]; then
@ -37,7 +36,6 @@ if [ ! -d $NDK ]; then
$ANDROID_NDK_SHA256
rm -Rf android-ndk-r$TERMUX_NDK_VERSION
unzip -q ndk-r${TERMUX_NDK_VERSION}.zip
mv android-ndk-r$TERMUX_NDK_VERSION $(basename $NDK)
fi
yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses