Update android tools and build tools
The Docker image has been rebuilt, update with: scripts/update-docker.sh
This commit is contained in:
parent
bcaba974c7
commit
81c7229f5a
@ -185,7 +185,7 @@ termux_step_setup_variables() {
|
||||
: "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
|
||||
: "${TERMUX_DEBUG:=""}"
|
||||
: "${TERMUX_API_LEVEL:="21"}"
|
||||
: "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.1"}"
|
||||
: "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}"
|
||||
: "${TERMUX_NDK_VERSION:="14"}"
|
||||
|
||||
if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
|
||||
|
@ -303,7 +303,7 @@ termux_step_make_install () {
|
||||
rm -rf android-jar
|
||||
mkdir android-jar
|
||||
cd android-jar
|
||||
cp $ANDROID_HOME/platforms/android-24/android.jar .
|
||||
cp $ANDROID_HOME/platforms/android-25/android.jar .
|
||||
unzip -q android.jar
|
||||
mkdir -p $TERMUX_PREFIX/share/aapt
|
||||
zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc
|
||||
|
@ -27,7 +27,7 @@ termux_step_make () {
|
||||
cd android-jar
|
||||
|
||||
# We need the android classes for JDT to compile against.
|
||||
cp $ANDROID_HOME/platforms/android-24/android.jar .
|
||||
cp $ANDROID_HOME/platforms/android-25/android.jar .
|
||||
unzip -q android.jar
|
||||
rm -Rf android.jar resources.arsc res assets
|
||||
zip -q -r android.jar .
|
||||
|
@ -11,7 +11,11 @@ if [ ! -d $ANDROID_HOME ]; then
|
||||
cd $ANDROID_HOME/..
|
||||
rm -Rf `basename $ANDROID_HOME`
|
||||
|
||||
curl --fail --retry 3 -o tools.zip https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
|
||||
# https://developer.android.com/studio/index.html#command-tools
|
||||
# The downloaded version below is 26.0.1.:
|
||||
curl --fail --retry 3 \
|
||||
-o tools.zip \
|
||||
https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
|
||||
rm -Rf android-sdk
|
||||
unzip -q tools.zip -d android-sdk
|
||||
rm tools.zip
|
||||
@ -31,4 +35,6 @@ if [ ! -d $NDK ]; then
|
||||
rm ndk.zip
|
||||
fi
|
||||
|
||||
echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "build-tools-25.0.1,android-24"
|
||||
mkdir $ANDROID_HOME/licenses
|
||||
echo -e -n "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
|
||||
$ANDROID_HOME/tools/bin/sdkmanager "build-tools;25.0.3" "platforms;android-25"
|
||||
|
Loading…
Reference in New Issue
Block a user