Update build tools version to 28.0.2
Also extract setting ndk and build tools version to scripts/properties.sh to avoid duplication.
This commit is contained in:
parent
f465b98b47
commit
b3f68a9b5c
|
@ -250,6 +250,7 @@ termux_step_handle_arguments() {
|
|||
|
||||
# Setup variables used by the build. Not to be overridden by packages.
|
||||
termux_step_setup_variables() {
|
||||
. $TERMUX_SCRIPTDIR/scripts/properties.sh
|
||||
: "${ANDROID_HOME:="${HOME}/lib/android-sdk"}"
|
||||
: "${NDK:="${HOME}/lib/android-ndk"}"
|
||||
: "${TERMUX_MAKE_PROCESSES:="$(nproc)"}"
|
||||
|
@ -259,8 +260,6 @@ termux_step_setup_variables() {
|
|||
: "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
|
||||
: "${TERMUX_DEBUG:=""}"
|
||||
: "${TERMUX_PKG_API_LEVEL:="21"}"
|
||||
: "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="28.0.1"}"
|
||||
: "${TERMUX_NDK_VERSION:="17"}"
|
||||
|
||||
if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
|
||||
TERMUX_ARCH_BITS=64
|
||||
|
|
|
@ -12,6 +12,7 @@ ENV LANG C.UTF-8
|
|||
# Needed for setup:
|
||||
COPY ./setup-ubuntu.sh /tmp/setup-ubuntu.sh
|
||||
COPY ./setup-android-sdk.sh /tmp/setup-android-sdk.sh
|
||||
COPY ./properties.sh /tmp/properties.sh
|
||||
|
||||
# Setup needed packages and the Android SDK and NDK:
|
||||
RUN apt-get update && \
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
check_package() { # path
|
||||
local path=$1
|
||||
local pkg=`basename $path`
|
||||
|
@ -33,9 +35,8 @@ check_package() { # path
|
|||
echo -n " }"
|
||||
}
|
||||
|
||||
. scripts/properties.sh
|
||||
export TERMUX_ARCH=aarch64
|
||||
export TERMUX_NDK_VERSION=17
|
||||
TERMUX_ANDROID_BUILD_TOOLS_VERSION=28.0.1
|
||||
|
||||
echo '['
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
. scripts/properties.sh
|
||||
|
||||
check_package() { # path
|
||||
local path=$1
|
||||
local pkg=`basename $path`
|
||||
TERMUX_PKG_REVISION=0
|
||||
TERMUX_ARCH=aarch64
|
||||
TERMUX_NDK_VERSION=17
|
||||
TERMUX_ANDROID_BUILD_TOOLS_VERSION=28.0.1
|
||||
. $path/build.sh
|
||||
if [ "$TERMUX_PKG_REVISION" != "0" ] || [ "$TERMUX_PKG_VERSION" != "${TERMUX_PKG_VERSION/-/}" ]; then
|
||||
TERMUX_PKG_VERSION+="-$TERMUX_PKG_REVISION"
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
TERMUX_NDK_VERSION=17
|
||||
TERMUX_ANDROID_BUILD_TOOLS_VERSION=28.0.2
|
|
@ -2,6 +2,7 @@
|
|||
set -e -u
|
||||
|
||||
# Install desired parts of the Android SDK:
|
||||
. $(cd "$(dirname "$0")"; pwd)/properties.sh
|
||||
test -f $HOME/.termuxrc && . $HOME/.termuxrc
|
||||
: ${ANDROID_HOME:="${HOME}/lib/android-sdk"}
|
||||
: ${NDK:="${HOME}/lib/android-ndk"}
|
||||
|
@ -25,17 +26,16 @@ if [ ! -d $NDK ]; then
|
|||
mkdir -p $NDK
|
||||
cd $NDK/..
|
||||
rm -Rf `basename $NDK`
|
||||
NDK_VERSION=r17
|
||||
curl --fail --retry 3 -o ndk.zip \
|
||||
http://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-`uname`-x86_64.zip
|
||||
http://dl.google.com/android/repository/android-ndk-r${TERMUX_NDK_VERSION}-`uname`-x86_64.zip
|
||||
|
||||
rm -Rf android-ndk-$NDK_VERSION
|
||||
rm -Rf android-ndk-r$TERMUX_NDK_VERSION
|
||||
unzip -q ndk.zip
|
||||
mv android-ndk-$NDK_VERSION `basename $NDK`
|
||||
mv android-ndk-r$TERMUX_NDK_VERSION `basename $NDK`
|
||||
rm ndk.zip
|
||||
fi
|
||||
|
||||
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
|
||||
|
||||
# The android-21 platform is used in the ecj package:
|
||||
$ANDROID_HOME/tools/bin/sdkmanager "build-tools;28.0.1" "platforms;android-27" "platforms;android-21"
|
||||
$ANDROID_HOME/tools/bin/sdkmanager "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-27" "platforms;android-21"
|
||||
|
|
Loading…
Reference in New Issue