From de45776e0bec6bbd7076cd40ca67e41a4a860c21 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Mon, 18 Jul 2022 17:35:23 +0400 Subject: [PATCH] Remove ndk-bundle from ubuntu --- .../SoftwareReport/SoftwareReport.Android.psm1 | 12 +++--------- images/linux/scripts/installers/android.sh | 12 ------------ images/linux/scripts/tests/Android.Tests.ps1 | 9 --------- images/linux/toolsets/toolset-1804.json | 1 - images/linux/toolsets/toolset-2004.json | 1 - images/linux/toolsets/toolset-2204.json | 1 - 6 files changed, 3 insertions(+), 33 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 5ba50848f40c..2c84696c4583 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -156,19 +156,13 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions = Get-ChildItem -Path $ndkFolderPath -Name - $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 - - return ($versions | ForEach-Object { - $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" - $_ + $defaultPostfix - } | Join-String -Separator "
") + return ($versions | Join-String -Separator "
") } function Build-AndroidEnvironmentTable { - $androidVersions = Get-Item env:ANDROID_* + $androidVersions = Get-Item env:ANDROID_* - $shouldResolveLink = 'ANDROID_NDK_PATH', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' + $shouldResolveLink = 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 4b292d3f77e5..1d5d3d7eacd6 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -34,17 +34,12 @@ function get_full_ndk_version { # Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables) ANDROID_ROOT=/usr/local/lib/android ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk -ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment # ANDROID_HOME is deprecated, but older versions of Gradle rely on it echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment -# Set env variables for NDK Root -echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" | tee -a /etc/environment -echo "ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}" | tee -a /etc/environment - # Create android sdk directory mkdir -p ${ANDROID_SDK_ROOT} @@ -89,8 +84,6 @@ extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .') addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .') additional=$(get_toolset_value '.android.additional_tools[]') ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk.versions[]')) -ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') -ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) components=("${extras[@]}" "${addons[@]}" "${additional[@]}") for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" @@ -99,11 +92,6 @@ do components+=("ndk;$ndk_full_version") done -# 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/$ndkDefaultFullVersion $ANDROID_NDK_ROOT - ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 3d530a0b990e..a38465b8caf7 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -2,9 +2,7 @@ Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique @@ -61,17 +59,10 @@ Describe "Android" { Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } - $defaultNdkTestCase = @{ NdkDefaultFullVersion = $ndkDefaultFullVersion } It "" -TestCases $testCases { param ([string] $PackageName) Validate-AndroidPackage $PackageName } - - It "ndk-bundle points to the default NDK version" -TestCases $defaultNdkTestCase { - $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target - $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf - $ndkVersion | Should -BeExactly $NdkDefaultFullVersion - } } } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index aac3736b924d..92a5c556d658 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -105,7 +105,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 1ffa6f199335..a67e2faa2dd3 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -102,7 +102,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index b5fa65dde716..884b0d0289c0 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -88,7 +88,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ]