diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 4f19089a..99b9508c 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -280,15 +280,15 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) $installedSimulators = $xcode.AddHeader("Installed Simulators") $installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) -if (-not $os.IsVenturaArm64) { -# Android section - $android = $installedSoftware.AddHeader("Android") - $androidTable = Build-AndroidTable - $android.AddTable($androidTable) - $androidEnv = $android.AddHeader("Environment variables") - $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -} +# Android section +$android = $installedSoftware.AddHeader("Android") +$androidTable = Build-AndroidTable +$android.AddTable($androidTable) + +$androidEnv = $android.AddHeader("Environment variables") +$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) + if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 6969689b..05434398 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -201,6 +201,7 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/bicep.sh", diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index f19e2087..54b18e33 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di $os = Get-OSVersion -Describe "Android" -Skip:($os.IsVenturaArm64) { +Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" @@ -50,7 +50,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { } } - Context "SDKManagers" -Skip:($os.IsVenturaArm64) { + Context "SDKManagers" { if (-not $os.IsVentura -and -not $os.IsVenturaArm64) { $testCases = @( @{ @@ -76,7 +76,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { } } - Context "Packages" -Skip:($os.IsVenturaArm64) { + Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } It "" -TestCases $testCases {