From 51afead06e0058364137df0c6b0cd51d6336fc77 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 21 Jan 2021 11:32:27 +0300 Subject: [PATCH] Freeze NDK 21 on Ubuntu Images (#2500) --- images/linux/scripts/installers/android.sh | 5 +++++ images/linux/toolsets/toolset-1604.json | 2 +- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 2273753b..132f0336 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -70,6 +70,11 @@ additional=$(get_toolset_value '.android.additional_tools[]') # Install the following SDKs and build tools, passing in "y" to accept licenses. components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" ) +# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). +# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 +# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 +ln -s $ANDROID_SDK_ROOT/ndk/21.3.6528147 $ANDROID_NDK_ROOT + availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1)) allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index e76d8a81..22ef6aa9 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -106,7 +106,7 @@ "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle", + "ndk;21.3.6528147", "platform-tools", "cmdline-tools;latest" ] diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 136d6f83..09364313 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -102,7 +102,7 @@ "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle", + "ndk;21.3.6528147", "platform-tools", "cmdline-tools;latest" ] diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index fe27c40b..900ed172 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -85,7 +85,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle", + "ndk;21.3.6528147", "platform-tools", "cmdline-tools;latest" ]