Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

properties.sh: Bump build-tools to 33.0.0 

* Bump SDK revision to 9123335

* Remove no longer used platforms;android-21

* Do not remove "unused parts" from SDK (which are actually used)

* Make it possible to use alternative JAVA_HOME via TERMUX_JAVA_HOME
This commit is contained in:
Tee KOBAYASHI 2022-11-12 11:08:46 +09:00 committed by xtkoba
parent b81046130a
commit 510c6adbe0
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/apksigner/build.sh
View File

@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="APK signing tool from Android SDK"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=${TERMUX_ANDROID_BUILD_TOOLS_VERSION}
TERMUX_PKG_REVISION=5
TERMUX_PKG_DEPENDS="openjdk-17"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_PLATFORM_INDEPENDENT=true

1
packages/d8/build.sh
View File

@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="DEX bytecode compiler from Android SDK"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=${TERMUX_ANDROID_BUILD_TOOLS_VERSION}
TERMUX_PKG_REVISION=2
TERMUX_PKG_DEPENDS="openjdk-17"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_PLATFORM_INDEPENDENT=true

7
scripts/properties.sh
View File

@ -3,8 +3,8 @@
# coreutils and are clearly not a default part of most Linux installations,
# or sourcing any other script in our build directories.
TERMUX_SDK_REVISION=8512546
TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3
TERMUX_SDK_REVISION=9123335
TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.0
: "${TERMUX_NDK_VERSION_NUM:="25"}"
: "${TERMUX_NDK_REVISION:="b"}"
TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
@ -14,7 +14,8 @@ TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
# update SHA256 sums in scripts/setup-android-sdk.sh
# check all packages build and run correctly and bump if needed
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
: "${TERMUX_JAVA_HOME:=/usr/lib/jvm/java-8-openjdk-amd64}"
export JAVA_HOME=${TERMUX_JAVA_HOME}
if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then
export ANDROID_HOME=${TERMUX_SCRIPTDIR}/build-tools/android-sdk-$TERMUX_SDK_REVISION

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

@ -9,7 +9,7 @@ set -e -u
. $(cd "$(dirname "$0")"; pwd)/build/termux_download.sh
ANDROID_SDK_FILE=commandlinetools-linux-${TERMUX_SDK_REVISION}_latest.zip
ANDROID_SDK_SHA256=2ccbda4302db862a28ada25aa7425d99dce9462046003c1714b059b5c47970d8
ANDROID_SDK_SHA256=0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a
if [ "$TERMUX_NDK_VERSION" = 25b ]; then
ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip
ANDROID_NDK_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005
@ -33,9 +33,6 @@ if [ ! -d "$ANDROID_HOME" ]; then
$ANDROID_SDK_SHA256
rm -Rf android-sdk-$TERMUX_SDK_REVISION
unzip -q tools-$TERMUX_SDK_REVISION.zip -d android-sdk-$TERMUX_SDK_REVISION
# Remove unused parts
rm -Rf android-sdk-$TERMUX_SDK_REVISION/{emulator*,lib*,proguard,templates}
fi
if [ ! -d "$NDK" ]; then
@ -77,5 +74,4 @@ yes | $SDK_MANAGER --sdk_root="$ANDROID_HOME" \
"build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" \
"platforms;android-33" \
"platforms;android-28" \
"platforms;android-24" \
"platforms;android-21"
"platforms;android-24"