Skip to content

[macos] add android SDK to SW report on Ventura ARM64 #8715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 7, 2023
Merged

[macos] add android SDK to SW report on Ventura ARM64 #8715

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b51af9
[macos] add android SDK to SW report on Ventura ARM64
ilia-shipitsin Nov 2, 2023
a1d8dfd
added android toolset to Ventura generation
ilia-shipitsin Nov 3, 2023
df162b8
enable tests on Ventura arm64
ilia-shipitsin Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[macos] add android SDK to SW report on Ventura ARM64
  • Loading branch information
@ilia-shipitsin
ilia-shipitsin committed Nov 2, 2023
commit 3b51af9e19686860e9b3092d69685779432eeca3
14 changes: 7 additions & 7 deletions images/macos/software-report/SoftwareReport.Generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
$android = $installedSoftware.AddHeader("Android")
$androidTable = Build-AndroidTable
$android.AddTable($androidTable)

$androidEnv = $android.AddHeader("Environment variables")
$androidEnv.AddTable($(Build-AndroidEnvironmentTable))

$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))
Expand Down