Skip to content

Commit be3fa4f

Browse files
[macos] add android SDK to SW report on Ventura ARM64 (#8715)
1 parent 9d94573 commit be3fa4f

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

images/macos/software-report/SoftwareReport.Generator.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,15 +280,15 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo))
280280

281281
$installedSimulators = $xcode.AddHeader("Installed Simulators")
282282
$installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo))
283-
if (-not $os.IsVenturaArm64) {
283+
284284
# Android section
285-
$android = $installedSoftware.AddHeader("Android")
286-
$androidTable = Build-AndroidTable
287-
$android.AddTable($androidTable)
285+
$android = $installedSoftware.AddHeader("Android")
286+
$androidTable = Build-AndroidTable
287+
$android.AddTable($androidTable)
288+
289+
$androidEnv = $android.AddHeader("Environment variables")
290+
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))
288291

289-
$androidEnv = $android.AddHeader("Environment variables")
290-
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))
291-
}
292292
if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
293293
$miscellaneous = $installedSoftware.AddHeader("Miscellaneous")
294294
$miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion))

images/macos/templates/macOS-13.arm64.anka.pkr.hcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ build {
201201
"./provision/core/rust.sh",
202202
"./provision/core/gcc.sh",
203203
"./provision/core/cocoapods.sh",
204+
"./provision/core/android-toolsets.sh",
204205
"./provision/core/safari.sh",
205206
"./provision/core/chrome.sh",
206207
"./provision/core/bicep.sh",

images/macos/tests/Android.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di
44

55
$os = Get-OSVersion
66

7-
Describe "Android" -Skip:($os.IsVenturaArm64) {
7+
Describe "Android" {
88
$androidSdkManagerPackages = Get-AndroidPackages
99
[int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version"
1010
[version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version"
@@ -50,7 +50,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) {
5050
}
5151
}
5252

53-
Context "SDKManagers" -Skip:($os.IsVenturaArm64) {
53+
Context "SDKManagers" {
5454
if (-not $os.IsVentura -and -not $os.IsVenturaArm64) {
5555
$testCases = @(
5656
@{
@@ -76,7 +76,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) {
7676
}
7777
}
7878

79-
Context "Packages" -Skip:($os.IsVenturaArm64) {
79+
Context "Packages" {
8080
$testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } }
8181

8282
It "<PackageName>" -TestCases $testCases {

0 commit comments

Comments
 (0)