Update from NDK version used from r15b to r15c

[termux-packages] / scripts / setup-android-sdk.sh

diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
index c81422d..4e0ddc8 100755 (executable)
--- a/scripts/setup-android-sdk.sh
+++ b/scripts/setup-android-sdk.sh
@@ -10,24 +10,31 @@ if [ ! -d $ANDROID_HOME ]; then
        mkdir -p $ANDROID_HOME
        cd $ANDROID_HOME/..
        rm -Rf `basename $ANDROID_HOME`
-       curl --fail --retry 3 -o android-sdk.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
 
-       rm -Rf android-sdk-linux
-       tar xzf android-sdk.tgz
-       mv android-sdk-linux `basename $ANDROID_HOME`
-       rm android-sdk.tgz
+       # 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
 fi
 
 if [ ! -d $NDK ]; then
        mkdir -p $NDK
        cd $NDK/..
        rm -Rf `basename $NDK`
-       curl --fail --retry 3 -o ndk.zip http://dl.google.com/android/repository/android-ndk-r12-`uname`-x86_64.zip
+       NDK_VERSION=r15c
+       curl --fail --retry 3 -o ndk.zip \
+               http://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-`uname`-x86_64.zip
 
-       rm -Rf android-ndk-r12
+       rm -Rf android-ndk-$NDK_VERSION
        unzip -q ndk.zip
-       mv android-ndk-r12 `basename $NDK`
+       mv android-ndk-$NDK_VERSION `basename $NDK`
        rm ndk.zip
 fi
 
-echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "build-tools-23.0.3,android-23"
+mkdir -p $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"