X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/11af8e220c825ebf84af050f3510db75a7629285..829516f1a4358f1d5e7ffdbd6145ac3c1b573c6d:/scripts/setup-android-sdk.sh

diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
index c0ce7f87..4e0ddc8a 100755
--- a/scripts/setup-android-sdk.sh
+++ b/scripts/setup-android-sdk.sh
@@ -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
@@ -21,7 +25,7 @@ if [ ! -d $NDK ]; then
 	mkdir -p $NDK
 	cd $NDK/..
 	rm -Rf `basename $NDK`
-	NDK_VERSION=r13
+	NDK_VERSION=r15c
 	curl --fail --retry 3 -o ndk.zip \
 		http://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-`uname`-x86_64.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 -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"