diff --git a/build-package.sh b/build-package.sh index 631ec52c4..62da1df80 100755 --- a/build-package.sh +++ b/build-package.sh @@ -43,7 +43,7 @@ if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}e : ${TERMUX_GCC_VERSION:="4.9"} : ${TERMUX_API_LEVEL:="21"} : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"} -: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.0"} +: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.2"} # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # the standalone toolchain. diff --git a/install-sdk.sh b/install-sdk.sh index 0d158af0f..af5b95222 100755 --- a/install-sdk.sh +++ b/install-sdk.sh @@ -1,3 +1,8 @@ #!/bin/sh -android update sdk --all --no-https --no-ui --filter build-tools-23.0.0,android-21 +# Read settings from .termuxrc if existing +test -f $HOME/.termuxrc && . $HOME/.termuxrc +: ${ANDROID_HOME:="${HOME}/lib/android-sdk"} + +$ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "build-tools-23.0.2" +$ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "android-21"