From c5b22a6722eef443f1a509b5cc6832aeafbb96a5 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 9 Nov 2021 16:17:12 +0300 Subject: [PATCH] Moved to ndk 23 and other prebuilt updates --- compose/scripts/downloadAndroidSdk | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/compose/scripts/downloadAndroidSdk b/compose/scripts/downloadAndroidSdk index b31ee90b9f..f05f716283 100755 --- a/compose/scripts/downloadAndroidSdk +++ b/compose/scripts/downloadAndroidSdk @@ -17,27 +17,37 @@ clone() { downloadLinuxSDK() { clone ../prebuilts/fullsdk-linux/platforms/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-31 master clone ../prebuilts/fullsdk-linux/sources/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-31 master - clone ../prebuilts/fullsdk-linux/ndk https://android.googlesource.com/toolchain/prebuilts/ndk/r21 master + clone ../prebuilts/fullsdk-linux/ndk https://android.googlesource.com/toolchain/prebuilts/ndk/r23 master clone ../prebuilts/fullsdk-linux/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-linux/build-tools/30.0.3 master clone ../prebuilts/fullsdk-linux/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/platform-tools master clone ../prebuilts/fullsdk-linux/tools https://android.googlesource.com/platform/prebuilts/fullsdk-linux/tools master - clone ../prebuilts/fullsdk-linux/cmake https://android.googlesource.com/platform/prebuilts/cmake/linux-x86 de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1 + clone ../prebuilts/fullsdk-linux/cmake https://android.googlesource.com/platform/prebuilts/cmake/linux-x86 master } downloadMacOsSDK() { clone ../prebuilts/fullsdk-darwin/platforms/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/platforms/android-31 master clone ../prebuilts/fullsdk-darwin/sources/android-31 https://android.googlesource.com/platform/prebuilts/fullsdk/sources/android-31 master - clone ../prebuilts/fullsdk-darwin/ndk https://android.googlesource.com/toolchain/prebuilts/ndk-darwin/r21 master + clone ../prebuilts/fullsdk-darwin/ndk https://android.googlesource.com/toolchain/prebuilts/ndk-darwin/r23 master clone ../prebuilts/fullsdk-darwin/build-tools/30.0.3 https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/build-tools/30.0.3 master clone ../prebuilts/fullsdk-darwin/platform-tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/platform-tools master clone ../prebuilts/fullsdk-darwin/tools https://android.googlesource.com/platform/prebuilts/fullsdk-darwin/tools master - clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 fc59035d8c856055f2a263dc8a2f9de96c959cc2 + clone ../prebuilts/fullsdk-darwin/cmake https://android.googlesource.com/platform/prebuilts/cmake/darwin-x86 master +} + +setupNativeBuildTools() { + mkdir -p ../prebuilts/fullsdk-$1/native-build-tools/bin/ + pushd ../prebuilts/fullsdk-$1/native-build-tools/bin/ + ln -s ../../ninja/bin/ninja . + ln -s ../../cmake/bin/cmake . + popd } if [[ "$OSTYPE" == "linux-gnu"* ]]; then downloadLinuxSDK + setupNativeBuildTools linux elif [[ "$OSTYPE" == "darwin"* ]]; then downloadMacOsSDK + setupNativeBuildTools darwin elif [[ "$OSTYPE" == "cygwin" ]]; then echo "Please download Android SDK manually (https://developer.android.com/studio)" elif [[ "$OSTYPE" == "msys" ]]; then